Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

git clone https://repo.autonoma.ca/repo/keenwrite.git

A .classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/main/resources">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<accessrules>
 			<accessrule kind="accessible" pattern="javafx/**"/>
 		</accessrules>
 	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

A .gitattributes

 # always use LF line endings
 # ALL FILES:
 #   Normalize line endings to LF on checkin and
 #   prevent conversion to CRLF when the file is checked out.
 * text eol=lf
 # BINARY FILES:
 #   Disable line ending normalize on checkin.
 *.gif binary
 *.jar binary
 *.png binary
 *.zip binary

A .gitignore

 /bin/
 /build/
 /.gradle/
 /gradle/
 /.nb-gradle
 /private
 .nb-gradle-properties
 scrivenvar.pro

A .idea/.gitignore

	1	workspace.xml
1	2

A .idea/codeStyles/codeStyleConfig.xml

 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>

A .idea/compiler.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="11" />
   </component>
 </project>

A .idea/gradle.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/opt/gradle" />
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
       </GradleProjectSettings>
     </option>
   </component>
 </project>

A .idea/jarRepositories.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="MavenRepo" />
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="maven" />
       <option name="name" value="maven" />
       <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="BintrayJCenter" />
       <option name="name" value="BintrayJCenter" />
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="maven2" />
       <option name="name" value="maven2" />
       <option name="url" value="https://nexus.bedatadriven.com/content/groups/public" />
     </remote-repository>
   </component>
 </project>

A .idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="14" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

A .idea/rGraphicsSettings.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RGraphicsSettings">
     <option name="height" value="1600" />
     <option name="resolution" value="112" />
     <option name="version" value="1" />
     <option name="width" value="2560" />
   </component>
 </project>

A .idea/rSettings.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RSettings">
     <option name="interpreterPath" value="/usr/bin/R" />
   </component>
 </project>

A .idea/rpackages.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RPackageService">
     <option name="enabledRepositoryUrls">
       <list>
         <option value="@CRAN@" />
       </list>
     </option>
   </component>
 </project>

A .idea/scrivenvar.iml

1
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<module type="JAVA_MODULE" version="4" />

A .idea/uiDesigner.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Palette2">
     <group name="Swing">
       <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
       </item>
       <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
       </item>
       <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
       </item>
       <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
         <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
       </item>
       <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
         <initial-values>
           <property name="text" value="Button" />
         </initial-values>
       </item>
       <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
         <initial-values>
           <property name="text" value="RadioButton" />
         </initial-values>
       </item>
       <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
         <initial-values>
           <property name="text" value="CheckBox" />
         </initial-values>
       </item>
       <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
         <initial-values>
           <property name="text" value="Label" />
         </initial-values>
       </item>
       <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
           <preferred-size width="150" height="-1" />
         </default-constraints>
       </item>
       <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
           <preferred-size width="150" height="-1" />
         </default-constraints>
       </item>
       <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
           <preferred-size width="150" height="-1" />
         </default-constraints>
       </item>
       <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
           <preferred-size width="150" height="50" />
         </default-constraints>
       </item>
       <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
           <preferred-size width="150" height="50" />
         </default-constraints>
       </item>
       <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
           <preferred-size width="150" height="50" />
         </default-constraints>
       </item>
       <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
       </item>
       <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
           <preferred-size width="150" height="50" />
         </default-constraints>
       </item>
       <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
           <preferred-size width="150" height="50" />
         </default-constraints>
       </item>
       <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
           <preferred-size width="150" height="50" />
         </default-constraints>
       </item>
       <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
           <preferred-size width="200" height="200" />
         </default-constraints>
       </item>
       <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
           <preferred-size width="200" height="200" />
         </default-constraints>
       </item>
       <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
       </item>
       <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
       </item>
       <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
       </item>
       <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
       </item>
       <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
           <preferred-size width="-1" height="20" />
         </default-constraints>
       </item>
       <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
       </item>
       <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
       </item>
     </group>
   </component>
 </project>

A .idea/vcs.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

A .project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>Markdown Writer FX</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
 			<id>1438449113801</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
 			</matcher>
 		</filter>
 		<filter>
 			<id>1438449113801</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
 </projectDescription>

A .settings/org.eclipse.buildship.core.prefs

 GRADLE_BUILD_COMMANDS=org.eclipse.jdt.core.javabuilder
 GRADLE_NATURES=org.eclipse.jdt.core.javanature
 build.commands=org.eclipse.jdt.core.javabuilder
 connection.arguments=
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.gradle.user.home=null
 connection.java.home=null
 connection.jvm.arguments=
 connection.project.dir=
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature
 project.path=\:

A .settings/org.eclipse.core.runtime.prefs

	1	eclipse.preferences.version=1
	2	line.separator=\n
1	3

A .settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.8

A .settings/org.eclipse.jdt.ui.prefs

 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javafx;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
 sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
 sp_cleanup.add_missing_override_annotations_interface_methods=true
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
 sp_cleanup.remove_unnecessary_nls_tags=false
 sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false

A .travis.yml

 language: java
 jdk:
 - oraclejdk8
 # enable Java 8u45+, see https://github.com/travis-ci/travis-ci/issues/4042
 addons:
   apt:
     packages:
       - oracle-java8-installer
 os:
   - linux
 # run in container
 sudo: false

A BUILD.md

 # Build
 This document describes how to build the application.
 # Requirements
 Download and install the following software packages:
 * [OpenJDK 14](https://openjdk.java.net)
 * [Gradle 6.4](https://gradle.org/releases)
 # Compile
 Build the application as follows:
     gradle clean jar
 The application is built.
 # Run
 After the application is compiled, run it as follows:
     java -jar build/libs/scrivenvar.jar
 On Windows:
     java -jar build\libs\scrivenvar.jar

A CREDITS.md

 # Credits
 * Dave Jarvis: [Scrivenvar](https://github.com/DaveJarvis/scrivenvar/)
 * Karl Tauber: [Markdown Writer FX](https://github.com/JFormDesigner/markdown-writer-fx)
 * Tomas Mikula: [RichTextFX](https://github.com/TomasMikula/RichTextFX), [ReactFX](https://github.com/TomasMikula/ReactFX), [WellBehavedFX](https://github.com/TomasMikula/WellBehavedFX), [Flowless](https://github.com/TomasMikula/Flowless), and [UndoFX](https://github.com/TomasMikula/UndoFX)
 * Mikael Grev: [MigLayout](http://www.miglayout.com/)
 * Tom Eugelink: [MigPane](https://github.com/mikaelgrev/miglayout/blob/master/javafx/src/main/java/org/tbee/javafx/scene/layout/fxml/MigPane.java)
 * Vladimir Schneider: [flexmark](https://website.com)
 * Jens Deters: [FontAwesomeFX](https://bitbucket.org/Jerady/fontawesomefx)
 * Shy Shalom, Kohei Taketa: [juniversalchardet](https://github.com/takscape/juniversalchardet)
 * David Croft, [File Preferences](https://github.com/eis/simple-suomi24-java-client/tree/master/src/main/java/net/infotrek/util/prefs)
 * Alex Bertram, [Renjin](https://www.renjin.org/)
 * Michael Kay, [XSLT Processor](http://www.saxonica.com/)

A LICENSE.md

 # License
 Copyright 2020 White Magic Software, Ltd.
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

A R/README.md

 # R Functions
 Import the files in this directory into the application, which include:
 * pluralize.R
 * possessive.R
 # pluralize.R
 This file defines a function that implements most of Damian Conway's [An Algorithmic Approach to English Pluralization](http://blob.perl.org/tpc/1998/User_Applications/Algorithmic%20Approach%20Plurals/Algorithmic_Plurals.html).
 ## Usage
 Example usages of the pluralize function include:
     `r#pluralize( 'mouse' )` - mice
     `r#pluralize( 'buzz' )` - buzzes
     `r#pluralize( 'bus' )` - busses
 # possessive.R
 This file defines a function that applies possessives to English words.
 ## Usage
 Example usages of the possessive function include:
     `r#pos( 'Ross' )` - Ross'
     `r#pos( 'Ruby' )` - Ruby's
     `r#pos( 'Lois' )` - Lois'
     `r#pos( 'my' )` - mine
     `r#pos( 'Your' )` - Yours

A R/pluralize.R

 # -----------------------------------------------------------------------------
 # Copyright 2020, White Magic Software, Ltd.
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # See Damian Conway's "An Algorithmic Approach to English Pluralization":
 #   http://goo.gl/oRL4MP
 # See Oliver Glerke's Evo Inflector: https://github.com/atteo/evo-inflector/
 # See Shevek's Pluralizer: https://github.com/shevek/linguistics/
 # See also: http://www.freevectors.net/assets/files/plural.txt
 # -----------------------------------------------------------------------------
 pluralize <- function( s, n ) {
   result <- s
   # Partial implementation of Conway's algorithm for nouns.
   if( n != 1 ) {
     if( pl.noninflective( s ) ||
         pl.suffix( "es", s ) ||
         pl.suffix( "fish", s ) ||
         pl.suffix( "ois", s ) ||
         pl.suffix( "sheep", s ) ||
         pl.suffix( "deer", s ) ||
         pl.suffix( "pox", s ) ||
         pl.suffix( "[A-Z].*ese", s ) ||
         pl.suffix( "itis", s ) ) {
       # 1. Retain non-inflective user-mapped noun as is.
       # 2. Retain non-inflective plural as is.
       result <- s
+    }
     else if( pl.is.irregular.pl( s ) ) {
       # 4. Change irregular plurals based on mapping.
       result <- pl.irregular.pl( s )
+    }
     else if( pl.is.irregular.es( s ) ) {
       # x. From Shevek's
       result <- pl.inflect( s, "", "es" )
+    }
     else if( pl.suffix( "man", s ) ) {
       # 5. For -man, change -an to -en
       result <- pl.inflect( s, "an", "en" )
+    }
     else if( pl.suffix( "[lm]ouse", s ) ) {
       # 5. For [lm]ouse, change -ouse to -ice
       result <- pl.inflect( s, "ouse", "ice" )
+    }
     else if( pl.suffix( "tooth", s ) ) {
       # 5. For -tooth, change -ooth to -eeth
       result <- pl.inflect( s, "ooth", "eeth" )
+    }
     else if( pl.suffix( "goose", s ) ) {
       # 5. For -goose, change -oose to -eese
       result <- pl.inflect( s, "oose", "eese" )
+    }
     else if( pl.suffix( "foot", s ) ) {
       # 5. For -foot, change -oot to -eet
       result <- pl.inflect( s, "oot", "eet" )
+    }
     else if( pl.suffix( "zoon", s ) ) {
       # 5. For -zoon, change -on to -a
       result <- pl.inflect( s, "on", "a" )
+    }
     else if( pl.suffix( "[csx]is", s ) ) {
       # 5. Change -cis, -sis, -xis to -es
       result <- pl.inflect( s, "is", "es" )
+    }
     else if( pl.suffix( "([cs]h|ss|zz|x|s)", s ) ) {
       # 8. Change -ch, -sh, -ss, -zz, -x, -s to -es
       result <- pl.inflect( s, "", "es" )
+    }
     else if( pl.suffix( "([aeo]lf|[^d]eaf|arf)", s ) ) {
       # 9. Change -f to -ves
       result <- pl.inflect( s, "f", "ves" )
+    }
     else if( pl.suffix( "[nlw]ife", s ) ) {
       # 10. Change -fe to -ves
       result <- pl.inflect( s, "fe", "ves" )
+    }
     else if( pl.suffix( "[aeiou]y", s ) ) {
       # 11. Change -[aeiou]y to -ys
       result <- pl.inflect( s, "", "s" )
+    }
     else if( pl.suffix( "y", s ) ) {
       # 12. Change -y to -ies
       result <- pl.inflect( s, "y", "ies" )
+    }
     else if( pl.suffix( "z", s ) ) {
       # x. Change -z to -zzes
       result <- pl.inflect( s, "", "zes" )
+    }
     else {
       # 13. Default plural: add -s
       result <- pl.inflect( s, "", "s" )
+    }
+  }
   result
+}
 # -----------------------------------------------------------------------------
 # Returns the given string (s) with its suffix replaced by r.
 # -----------------------------------------------------------------------------
 pl.inflect <- function( s, suffix, r ) {
   gsub( paste( suffix, "$", sep="" ), r, s )
+}
 # -----------------------------------------------------------------------------
 # Answers whether the given string (s) has the given ending.
 # -----------------------------------------------------------------------------
 pl.suffix <- function( ending, s ) {
   grepl( paste( ending, "$", sep="" ), s )
+}
 # -----------------------------------------------------------------------------
 # Answers whether the given string (s) is a noninflective noun.
 # -----------------------------------------------------------------------------
 pl.noninflective <- function( s ) {
   v <- c(
     "aircraft",
     "Bhutanese",
     "bison",
     "bream",
     "Burmese",
     "carp",
     "chassis",
     "Chinese",
     "clippers",
     "cod",
     "contretemps",
     "corps",
     "debris",
     "djinn",
     "eland",
     "elk",
     "flounder",
     "fracas",
     "gallows",
     "graffiti",
     "headquarters",
     "high-jinks",
     "homework",
     "hovercraft",
     "innings",
     "Japanese",
     "Lebanese",
     "mackerel",
     "means",
     "mews",
     "mice",
     "mumps",
     "news",
     "pincers",
     "pliers",
     "Portuguese",
     "proceedings",
     "salmon",
     "scissors",
     "sea-bass",
     "Senegalese",
     "shears",
     "Siamese",
     "Sinhalese",
     "spacecraft",
     "swine",
     "trout",
     "tuna",
     "Vietnamese",
     "watercraft",
     "whiting",
     "wildebeest"
+  )
   is.element( s, v )
+}
 # -----------------------------------------------------------------------------
 # Answers whether the given string (s) is an irregular plural.
 # -----------------------------------------------------------------------------
 pl.is.irregular.pl <- function( s ) {
   # Could be refactored with pl.irregular.pl...
   v <- c(
     "beef", "brother", "child", "cow", "ephemeris", "genie", "money",
     "mongoose", "mythos", "octopus", "ox", "soliloquy", "trilby"
+  )
   is.element( s, v )
+}
 # -----------------------------------------------------------------------------
 # Call to pluralize an irregular noun. Only call after confirming
 # the noun is irregular via pl.is.irregular.pl.
 # -----------------------------------------------------------------------------
 pl.irregular.pl <- function( s ) {
   v <- list(
     "beef" = "beefs",
     "brother" = "brothers",
     "child" = "children",
     "cow" = "cows",
     "ephemeris" = "ephemerides",
     "genie" = "genies",
     "money" = "moneys",
     "mongoose" = "mongooses",
     "mythos" = "mythoi",
     "octopus" = "octopuses",
     "ox" = "oxen",
     "soliloquy" = "soliloquies",
     "trilby" = "trilbys"
+  )
   # Faster version of v[[ s ]]
   .subset2( v, s )
+}
 # -----------------------------------------------------------------------------
 # Answers whether the given string (s) pluralizes with -es.
 # -----------------------------------------------------------------------------
 pl.is.irregular.es <- function( s ) {
   v <- c(
     "acropolis", "aegis", "alias", "asbestos", "bathos", "bias", "bronchitis",
     "bursitis", "caddis", "cannabis", "canvas", "chaos", "cosmos", "dais",
     "digitalis", "epidermis", "ethos", "eyas", "gas", "glottis", "hubris",
     "ibis", "lens", "mantis", "marquis", "metropolis", "pathos", "pelvis",
     "polis", "rhinoceros", "sassafrass", "trellis"
+  )
   is.element( s, v )
+}

A R/possessive.R

 # -----------------------------------------------------------------------------
 # Copyright 2020, White Magic Software, Ltd.
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # Returns leftmost n characters of s.
 # -----------------------------------------------------------------------------
 lstr <- function( s, n = 1 ) {
   substr( s, 0, n )
+}
 # -----------------------------------------------------------------------------
 # Returns rightmost n characters of s.
 # -----------------------------------------------------------------------------
 rstr <- function( s, n = 1 ) {
   l <- nchar( s )
   substr( s, l - n + 1, l )
+}
 # -----------------------------------------------------------------------------
 # Returns the possessive form of the given word, s.
 # -----------------------------------------------------------------------------
 pos <- function( s ) {
   lcs <- tolower( s )
   pronouns <- c( 'your', 'our', 'her', 'it', 'their' )
   if( lcs == 'my' ) {
     # Change "[Mm]y" to "[Mm]ine".
     s <- paste0( lstr( s, 1 ), "ine" )
+  }
   else if( lcs %in% pronouns ) {
     # Append an s to most pronouns.
     s <- paste0( s, 's' )
+  }
   else if( lcs != 'his' ) {
     # Possessive for all other words except 'his'.
     s <- paste0( s, ifelse( rstr( s, 1 ) == 's', "'" ,"'s" ) )
+  }
+  s
+}

A README.md

 ![Logo](images/logo64.png)
 # $application.title$
 A text editor that uses [interpolated strings](https://en.wikipedia.org/wiki/String_interpolation) to reference externally defined values.
 ## Requirements
 Download and install the following software packages:
 * [OpenJDK 14](https://openjdk.java.net)
 ## Quick Start
 Complete the following steps to run the application:
 . [Download](https://github.com/DaveJarvis/scrivenvar/releases)
 `scrivenvar.jar`.
 . Double-click `scrivenvar.jar` to start the application.
 ## Command Line Start
 If the quick start fails, run the application as follows:
 . Open a command prompt.
 . Change to the download directory containing the archive file.
 . Run: `java -jar scrivenvar.jar`
 ## Features
 * R integration
 * User-defined variables, interpolated
 * Real-time preview with variable substitution
 * Auto-complete variable names based on variable values
 * XML document transformation using XSLT3 or older
 * Platform independent (Windows, Linux, MacOS)
 ## Usage
 See the following documents for more information:
 * [USAGE.md](USAGE.md) - how variable definitions and string interpolation work.
 * [USAGE-R.md](USAGE-R.md) - how to call R functions in R Markdown documents.
 ## Future Features
 * Spell check
 * Search and replace using variables
 * Re-organize variable names
 ## Screenshot
 ![Screenshot](images/screenshot.png)
 ## License
 This software is licensed under the [BSD 2-Clause License](LICENSE.md).

A USAGE-R.md

 # Introduction
 This document describes how to use the [R](https://www.r-project.org/)
 programming language from within the application. The application uses an
 interpreter known as [Renjin](https://www.renjin.org/) to integrate with R.
 # Hello World
 Complete the following steps to see R in action:
 . Start the application.
 . Click **File → New** to create a new file.
 . Click **File → Save As**.
 . Set **Name** to: `addition.Rmd`
 . Click **Save**.
 Setting the file name extension tells the application what processor to
 use when transforming the contents for display in the preview pane. Continue
 by typing in the following text, including the backticks:
 ```r
 `r#1 + 1`
 ```
 The preview pane shows the result of `1` plus `1`:
 ```
 .0
 ```
 # Bootstrap Script
 Being able to run R code while editing an R Markdown document is convenient.
 Having the ability to call functions is where the power of R can be
 leveraged.
 Complete the following steps to call an R function from your own library:
 . Click **File → New** to create a new file.
 . Click **File → Save As**.
 . Browse to your home directory.
 . Set **Name** to: `library.R`.
 . Click **Save**.
 . Set the contents to:
     ``` r
     sum <- function( a, b ) {
       a + b
+    }
     ```
 . Click the **Save** icon.
 . Click **R → Script**.
 . Set the **R Startup Script** contents to:
     ``` r
     source( 'library.R' );
     ```
 . Click **OK**.
 . Create a new file.
 . Set the contents to:
     ``` r
     `r#sum( 5, 5 )`
     ```
 . Save the file as `sum.R`.
 The preview panel shows the result of calling the `sum` function:
 ```
 .0
 ```
 This shows how the bootstrap script can load `library.R`, which defines
 a `sum` function that is called by name in the Markdown document.
 # Working Directory
 R files may be sourced from any directory, not just the user's home
 directory. Accomplish this as follows:
 . Click **R → Directory**.
 . Set **Directory** to a different directory.
 . Click **OK**.
 . Create the directory if it does not exist.
 . Move `library.R` into the directory.
 . Append a new function to `library.R` as follows:
     ``` r
     mul <- function( a, b ) {
       a * b
+    }
     ```
 . Click **R → Script**.
 . Set the **R Startup Script** contents to:
     ``` r
     setwd( '$application.r.working.directory$' );
     source( 'library.R' );
     ```
 . Change `sum.Rmd` to:
     ``` r
     `r#mul( 5, 5 )`
     ```
 . Close the file `sum.Rmd`.
 . Confirm saving the file when prompted.
 . Re-open `sum.Rmd`.
 The preview panel shows:
 ```
 .0
 ```
 Calling `setwd` using `'$application.r.working.directory$'` changes the
 working directory where the R engine searches for source files.
 # YAML Definitions
 To see how variable definitions work in R, try the following:
 . Create a new file.
 . Change the contents to (use spaces not tabs):
     ``` yaml
     project:
       title: Project Title
       author: Author Name
     ```
 . Save the file as `definitions.yaml`.
 . Click **File → Open**.
 . Set **Source Files** to **Definition Files**.
 . Select `definitions.yaml`.
 . Click **Open**.
 . Open `sum.Rmd` if it is not already open.
 . Type: `je`
 . Press `Ctrl+Space`
 The editor inserts the following text (matches `je` against Pro**je**ct):
 ``` r
 `r#x( v$project$title )`
 ```
 The preview panel shows:
 ```
 r#x( 'Project Title' )
 ```
 This is because the application inserts definition reference names based
 on the type of file being edited. By default, the R engine does not have
 a function named `x` defined.
 Continue as follows:
 . Click **R → Script**.
 . Append the following:
     ``` r
     x <- function( s ) {
       tryCatch( {
         r = eval( parse( text = s ) )
         ifelse( is.atomic( r ), r, s );
       },
       warning = function( w ) { s },
       error = function( e ) { s } )
+    }
     ```
 . Click **OK**.
 . Close and re-open `sum.Rmd`.
 The preview panel shows:
 ```
 .0
 Project Title
 ```
 The `x` function attempts to evaluate the expression defined by the YAML
 variable. This means that the YAML definitions can also include expressions
 that R is capable of evaluating.
 While the `x` function can be defined within the R Startup Script, it is
 better practice to put it into its own library so that it can be reused
 outside of the application.

A USAGE.md

 # Introduction
 This document describes how to use the application.
 # Variable Definitions
 Variable definitions provide a way to insert key names having associated values into a document. The variable names and values are declared inside an external file using the [YAML](http://www.yaml.org/) file format. Simply put, variables are written in the file as follows:
 ```
 key: value
 ```
 Any number of variables can be defined, in any order:
 ```
 key_1: Value 1
 key_2: Value 2
 ```
 Variables can reference other variables by enclosing the key name within dollar symbols:
 ```
 key: Value
 key_1: $key$ 1
 key_2: $key$ 2
 ```
 Variables can use a nested structure to help group related information:
 ```
 novel:
   title: Book Title
   author: Author Name
   isbn: 978-3-16-148410-0
 ```
 Use a period to reference nested keys, such as:
 ```
 novel:
   author: Author Name
 copyright:
   owner: $novel.author$
 ```
 Save the variable definitions in a file having an extension of `.yaml` or `.yml`.
 # Document Editing
 The application's purpose is to completely separate the document's content from its presentation. To achieve this, documents are composed using a [plain text](http://spec.commonmark.org/0.28/) format.
 ## Create Document
 Start a new document as follows:
 . Start the application.
 . Click **File → New** to create an empty document to edit.
 . Click **File → Open** to open a variable definition file.
 . Change **Source Files** to **Definition Files** to list definition files.
 . Browse to and select a file saved with a `.yaml` or `.yml` extension.
 . Click **Open**.
 The variable definitions appear in the variable definition pane under the heading of **Definitions**.
 ## Edit Document
 Edit the document as normal. Notice how the preview pane updates as new content is added. The toolbar shows various icons that perform different formatting operations. Try them to see how they appear in the preview pane. Other operations not shown on the toolbar include:
 * Struck text (enclose the words within `~~` and `~~`)
 * Horizontal rule (use `---` on an otherwise empty line).
 The preview pane shows one way to interpret and format the document, but many other presentations are possible.
 ## Insert Variable
 Let's assume that the variable definitions loaded into the application include:
 ```
 novel:
   title: Diary of $novel.author$
   author: Anne Frank
 ```
 To reference a variable, type in the key name enclosed within dollar symbols, such as:
 ```
 The novel "$novel.title$" is one of the most widely read books in the world.
 ```
 The preview pane shows:
 > The novel "Diary of Anne Frank" is one of the most widely read books in the world.
 As it is laborious to type in variable names, it is possible to inject the variable name using autocomplete. Accomplish this as follows:
 . Create a new file.
 . Type in a partial variable value, such as **Dia**.
 . Press `Ctrl+Space` (hold down the `Control` key and tap the spacebar).
 The editor shows:
 ```
 $novel.title$
 ```
 The preview pane shows:
 ```
 Diary of Anne Frank
 ```
 The variable name is inserted into the document and the preview pane shows the variable's value.

A _config.yaml

 ---
 application:
   title: "Scrivenvar"

A build.gradle

 plugins {
   id 'application'
   id 'org.openjfx.javafxplugin' version '0.0.8'
   id 'com.palantir.git-version' version '0.12.3'
+}
 repositories {
   mavenCentral()
   jcenter()
   maven {
     url 'https://oss.sonatype.org/content/repositories/snapshots/'
+  }
   maven {
     url "https://nexus.bedatadriven.com/content/groups/public"
+  }
+}
 dependencies {
   implementation 'org.controlsfx:controlsfx:11.0.1'
   implementation 'org.fxmisc.richtext:richtextfx:0.10.5'
   implementation 'org.fxmisc.wellbehaved:wellbehavedfx:0.3.3'
   implementation 'com.miglayout:miglayout-javafx:5.2'
   implementation 'com.dlsc.preferencesfx:preferencesfx-core:11.6.0'
   implementation 'com.vladsch.flexmark:flexmark:0.62.2'
   implementation 'com.vladsch.flexmark:flexmark-ext-tables:0.62.2'
   implementation 'com.vladsch.flexmark:flexmark-ext-superscript:0.62.2'
   implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
   implementation 'com.fasterxml.jackson.core:jackson-core:2.11.0'
   implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
   implementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.0'
   implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.0'
   implementation 'org.ahocorasick:ahocorasick:0.4.0'
   implementation 'org.yaml:snakeyaml:1.26'
   implementation 'com.ximpleware:vtd-xml:2.13.4'
   implementation 'net.sf.saxon:Saxon-HE:10.1'
   implementation 'org.apache.commons:commons-configuration2:2.7'
   implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
   implementation 'de.jensd:fontawesomefx-commons:11.0'
   implementation 'de.jensd:fontawesomefx-fontawesome:4.7.0-11'
   implementation 'org.renjin:renjin-script-engine:3.5-beta76'
   implementation 'org.xhtmlrenderer:flying-saucer-core:9.1.20'
   implementation 'org.jsoup:jsoup:1.13.1'
   implementation 'org.apache.xmlgraphics:batik-all:1.13'
   def os = ['win', 'linux', 'mac']
   def fx = ['controls', 'graphics', 'fxml', 'swing']
   fx.each { fxitem ->
     os.each { ositem ->
       runtimeOnly "org.openjfx:javafx-${fxitem}:${javafx.version}:${ositem}"
+    }
+  }
   testImplementation('org.junit.jupiter:junit-jupiter-api:5.4.2')
   testRuntime('org.junit.jupiter:junit-jupiter-engine:5.4.2')
+}
 javafx {
   version = "14"
   modules = ['javafx.controls', 'javafx.graphics', 'javafx.swing']
+}
 compileJava {
   options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+}
 sourceCompatibility = JavaVersion.VERSION_11
 applicationName = 'scrivenvar'
 version = gitVersion()
 mainClassName = "com.${applicationName}.Main"
 def launcherClassName = "com.${applicationName}.Launcher"
 def propertiesFile = new File("src/main/resources/com/${applicationName}/app.properties")
 propertiesFile.write("application.version=${version}")
 jar {
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   manifest {
     attributes 'Main-Class': launcherClassName
+  }
   from {
     (configurations.runtimeClasspath.findAll { !it.path.endsWith(".pom") }).collect {
       it.isDirectory() ? it : zipTree(it)
+    }
+  }
   archiveFileName = "${applicationName}.jar"
   exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
+}
 distributions {
   main {
     distributionBaseName = applicationName
     contents {
       from { ['LICENSE.md', 'README.md'] }
       into('images') {
         from { 'images' }
+      }
+    }
+  }
+}
 test {
   useJUnitPlatform()
+}

A gradle.properties

	1	org.gradle.jvmargs=-Xmx1G -XX:MaxPermSize=512m
	2
1	3

A images/logo64.png

Binary file

A images/screenshot.png

Binary file

A licenses/MARKDOWN-WRITER-FX.md

 Copyright (c) 2015 Karl Tauber <karl@jformdesigner.com>
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

A settings.gradle

A src/main/java/com/scrivenvar/AbstractFileFactory.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.predicates.files.FileTypePredicate;
 import com.scrivenvar.service.Settings;
 import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.List;
 import static com.scrivenvar.Constants.GLOB_PREFIX_FILE;
 import static java.lang.String.format;
 /**
  * Provides common behaviours for factories that instantiate classes based on
  * file type.
+ *
  * @author White Magic Software, Ltd.
  */
 public class AbstractFileFactory {
   private static final String MSG_UNKNOWN_FILE_TYPE =
       "Unknown type '%s' for file '%s'.";
   private final Settings mSettings = Services.load( Settings.class );
   /**
    * Determines the file type from the path extension. This should only be
    * called when it is known that the file type won't be a definition file
    * (e.g., YAML or other definition source), but rather an editable file
    * (e.g., Markdown, XML, etc.).
+   *
    * @param path The path with a file name extension.
    * @return The FileType for the given path.
    */
   public FileType lookup( final Path path ) {
     return lookup( path, GLOB_PREFIX_FILE );
+  }
   /**
    * Creates a file type that corresponds to the given path.
+   *
    * @param path   Reference to a variable definition file.
    * @param prefix One of GLOB_PREFIX_DEFINITION or GLOB_PREFIX_FILE.
    * @return The file type that corresponds to the given path.
    */
   protected FileType lookup( final Path path, final String prefix ) {
     assert path != null;
     assert prefix != null;
     final Settings properties = getSettings();
     final Iterator<String> keys = properties.getKeys( prefix );
     boolean found = false;
     FileType fileType = null;
     while( keys.hasNext() && !found ) {
       final String key = keys.next();
       final List<String> patterns = properties.getStringSettingList( key );
       final FileTypePredicate predicate = new FileTypePredicate( patterns );
       if( found = predicate.test( path.toFile() ) ) {
         // Remove the EXTENSIONS_PREFIX to get the filename extension mapped
         // to a standard name (as defined in the settings.properties file).
         final String suffix = key.replace( prefix + ".", "" );
         fileType = FileType.from( suffix );
+      }
+    }
     return fileType;
+  }
   /**
    * Throws IllegalArgumentException because the given path could not be
    * recognized. This exists because
+   *
    * @param type The detected path type (protocol, file extension, etc.).
    * @param path The path to a source of definitions.
    */
   protected void unknownFileType( final String type, final String path ) {
     final String msg = format( MSG_UNKNOWN_FILE_TYPE, type, path );
     throw new IllegalArgumentException( msg );
+  }
   /**
    * Return the singleton Settings instance.
+   *
    * @return A non-null instance.
    */
   private Settings getSettings() {
     return this.mSettings;
+  }
+}

A src/main/java/com/scrivenvar/AbstractPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import org.tbee.javafx.scene.layout.fxml.MigPane;
 /**
  * Hides dependency on {@link MigPane} from subclasses.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class AbstractPane extends MigPane {
+}

A src/main/java/com/scrivenvar/Constants.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.service.Settings;
 /**
  * Defines application-wide default values.
+ *
  * @author White Magic Software, Ltd.
  */
 public class Constants {
   private static final Settings SETTINGS = Services.load( Settings.class );
   /**
    * Prevent instantiation.
    */
   private Constants() {
+  }
   private static String get( final String key ) {
     return SETTINGS.getSetting( key, "" );
+  }
   @SuppressWarnings("SameParameterValue")
   private static int get( final String key, final int defaultValue ) {
     return SETTINGS.getSetting( key, defaultValue );
+  }
   // Bootstrapping...
   public static final String SETTINGS_NAME =
       "/com/scrivenvar/settings.properties";
   public static final String APP_TITLE = get( "application.title" );
   public static final String APP_BUNDLE_NAME = get( "application.messages" );
   // Prevent double events when updating files on Linux (save and timestamp).
   public static final int APP_WATCHDOG_TIMEOUT = get(
       "application.watchdog.timeout", 200 );
   public static final String STYLESHEET_SCENE = get( "file.stylesheet.scene" );
   public static final String STYLESHEET_MARKDOWN = get(
       "file.stylesheet.markdown" );
   public static final String STYLESHEET_PREVIEW = get(
       "file.stylesheet.preview" );
   public static final String FILE_LOGO_16 = get( "file.logo.16" );
   public static final String FILE_LOGO_32 = get( "file.logo.32" );
   public static final String FILE_LOGO_128 = get( "file.logo.128" );
   public static final String FILE_LOGO_256 = get( "file.logo.256" );
   public static final String FILE_LOGO_512 = get( "file.logo.512" );
   public static final String PREFS_ROOT = get( "preferences.root" );
   public static final String PREFS_STATE = get( "preferences.root.state" );
   // Refer to filename extension settings in the configuration file. Do not
   // terminate these prefixes with a period.
   public static final String GLOB_PREFIX_FILE = "file.ext";
   public static final String GLOB_PREFIX_DEFINITION =
       "definition." + GLOB_PREFIX_FILE;
   // Different definition source protocols.
   public static final String DEFINITION_PROTOCOL_UNKNOWN = "unknown";
   public static final String DEFINITION_PROTOCOL_FILE = "file";
   // Takes two parameters: line number and column number.
   public static final String STATUS_BAR_LINE = "Main.statusbar.line";
   // "OK" text
   public static final String STATUS_BAR_OK = "Main.statusbar.state.default";
   public static final String STATUS_PARSE_ERROR = "Main.statusbar.parse.error";
   /**
    * Used when creating flat maps relating to resolved variables.
    */
   public static final int DEFAULT_MAP_SIZE = 64;
   public static final String PERSIST_IMAGES_DEFAULT =
       get( "file.stylesheet.scene" );
   /**
    * Default working directory to use for R startup script.
    */
   public static final String USER_DIRECTORY = System.getProperty( "user.dir" );
+}

A src/main/java/com/scrivenvar/FileEditorTab.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.editors.markdown.MarkdownEditorPane;
 import com.scrivenvar.service.events.Notification;
 import com.scrivenvar.service.events.Notifier;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Tab;
 import javafx.scene.control.Tooltip;
 import javafx.scene.text.Text;
 import javafx.stage.Window;
 import org.fxmisc.richtext.StyleClassedTextArea;
 import org.fxmisc.richtext.model.TwoDimensional.Position;
 import org.fxmisc.undo.UndoManager;
 import org.mozilla.universalchardet.UniversalDetector;
 import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import static com.scrivenvar.Messages.get;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
 import static org.fxmisc.richtext.model.TwoDimensional.Bias.Forward;
 /**
  * Editor for a single file.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class FileEditorTab extends Tab {
   private final Notifier mNotifier = Services.load( Notifier.class );
   private final EditorPane mEditorPane = new MarkdownEditorPane();
   private final ReadOnlyBooleanWrapper mModified = new ReadOnlyBooleanWrapper();
   private final BooleanProperty canUndo = new SimpleBooleanProperty();
   private final BooleanProperty canRedo = new SimpleBooleanProperty();
   /**
    * Character encoding used by the file (or default encoding if none found).
    */
   private Charset mEncoding = UTF_8;
   /**
    * File to load into the editor.
    */
   private Path mPath;
   public FileEditorTab( final Path path ) {
     setPath( path );
     mModified.addListener( ( observable, oldPath, newPath ) -> updateTab() );
     setOnSelectionChanged( e -> {
       if( isSelected() ) {
         Platform.runLater( this::activated );
+      }
     } );
+  }
   private void updateTab() {
     setText( getTabTitle() );
     setGraphic( getModifiedMark() );
     setTooltip( getTabTooltip() );
+  }
   /**
    * Returns the base filename (without the directory names).
+   *
    * @return The untitled text if the path hasn't been set.
    */
   private String getTabTitle() {
     return getPath().getFileName().toString();
+  }
   /**
    * Returns the full filename represented by the path.
+   *
    * @return The untitled text if the path hasn't been set.
    */
   private Tooltip getTabTooltip() {
     final Path filePath = getPath();
     return new Tooltip( filePath == null ? "" : filePath.toString() );
+  }
   /**
    * Returns a marker to indicate whether the file has been modified.
+   *
    * @return "*" when the file has changed; otherwise null.
    */
   private Text getModifiedMark() {
     return isModified() ? new Text( "*" ) : null;
+  }
   /**
    * Called when the user switches tab.
    */
   private void activated() {
     // Tab is closed or no longer active.
     if( getTabPane() == null || !isSelected() ) {
       return;
+    }
     // Switch to the tab without loading if the contents are already in memory.
     if( getContent() != null ) {
       getEditorPane().requestFocus();
       return;
+    }
     // Load the text and update the preview before the undo manager.
     load();
     // Track undo requests -- can only be called *after* load.
     initUndoManager();
     initLayout();
     initFocus();
+  }
   private void initLayout() {
     setContent( getScrollPane() );
+  }
   private Node getScrollPane() {
     return getEditorPane().getScrollPane();
+  }
   private void initFocus() {
     getEditorPane().requestFocus();
+  }
   private void initUndoManager() {
     final UndoManager<?> undoManager = getUndoManager();
     undoManager.forgetHistory();
     // Bind the editor undo manager to the properties.
     mModified.bind( Bindings.not( undoManager.atMarkedPositionProperty() ) );
     canUndo.bind( undoManager.undoAvailableProperty() );
     canRedo.bind( undoManager.redoAvailableProperty() );
+  }
   /**
    * Searches from the caret position forward for the given string.
+   *
    * @param needle The text string to match.
    */
   public void searchNext( final String needle ) {
     final String haystack = getEditorText();
     int index = haystack.indexOf( needle, getCaretPosition() );
     // Wrap around.
     if( index == -1 ) {
       index = haystack.indexOf( needle );
+    }
     if( index >= 0 ) {
       setCaretPosition( index );
       getEditor().selectRange( index, index + needle.length() );
+    }
+  }
   /**
    * Returns the index into the text where the caret blinks happily away.
+   *
    * @return A number from 0 to the editor's document text length.
    */
   public int getCaretPosition() {
     return getEditor().getCaretPosition();
+  }
   /**
    * Moves the caret to a given offset.
+   *
    * @param offset The new caret offset.
    */
   private void setCaretPosition( final int offset ) {
     getEditor().moveTo( offset );
     getEditor().requestFollowCaret();
+  }
   /**
    * Returns the caret's current row and column position.
+   *
    * @return The caret's offset into the document.
    */
   public Position getCaretOffset() {
     return getEditor().offsetToPosition( getCaretPosition(), Forward );
+  }
   /**
    * Allows observers to synchronize caret position changes.
+   *
    * @return An observable caret property value.
    */
   public final ObservableValue<Integer> caretPositionProperty() {
     return getEditor().caretPositionProperty();
+  }
   /**
    * Returns the text area associated with this tab.
+   *
    * @return A text editor.
    */
   private StyleClassedTextArea getEditor() {
     return getEditorPane().getEditor();
+  }
   /**
    * Returns true if the given path exactly matches this tab's path.
+   *
    * @param check The path to compare against.
    * @return true The paths are the same.
    */
   public boolean isPath( final Path check ) {
     final Path filePath = getPath();
     return filePath != null && filePath.equals( check );
+  }
   /**
    * Reads the entire file contents from the path associated with this tab.
    */
   private void load() {
     final Path path = getPath();
     final File file = path.toFile();
     try {
       if( file.exists() ) {
         if( file.canWrite() && file.canRead() ) {
           final EditorPane pane = getEditorPane();
           pane.setText( asString( Files.readAllBytes( path ) ) );
           pane.scrollToTop();
+        }
         else {
           final String msg = get(
               "FileEditor.loadFailed.message",
               file.toString(),
               get( "FileEditor.loadFailed.reason.permissions" )
           );
           getNotifier().notify( msg );
+        }
+      }
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   /**
    * Saves the entire file contents from the path associated with this tab.
+   *
    * @return true The file has been saved.
    */
   public boolean save() {
     try {
       final EditorPane editor = getEditorPane();
       Files.write( getPath(), asBytes( editor.getText() ) );
       editor.getUndoManager().mark();
       return true;
     } catch( final Exception ex ) {
       return alert(
           "FileEditor.saveFailed.title",
           "FileEditor.saveFailed.message",
           ex
       );
+    }
+  }
   /**
    * Creates an alert dialog and waits for it to close.
+   *
    * @param titleKey   Resource bundle key for the alert dialog title.
    * @param messageKey Resource bundle key for the alert dialog message.
    * @param e          The unexpected happening.
    * @return false
    */
   @SuppressWarnings("SameParameterValue")
   private boolean alert(
       final String titleKey, final String messageKey, final Exception e ) {
     final Notifier service = getNotifier();
     final Path filePath = getPath();
     final Notification message = service.createNotification(
         get( titleKey ),
         get( messageKey ),
         filePath == null ? "" : filePath,
         e.getMessage()
     );
     try {
       service.createError( getWindow(), message ).showAndWait();
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
     return false;
+  }
   private Window getWindow() {
     final Scene scene = getEditorPane().getScene();
     if( scene == null ) {
       throw new UnsupportedOperationException( "No scene window available" );
+    }
     return scene.getWindow();
+  }
   /**
    * Returns a best guess at the file encoding. If the encoding could not be
    * detected, this will return the default charset for the JVM.
+   *
    * @param bytes The bytes to perform character encoding detection.
    * @return The character encoding.
    */
   private Charset detectEncoding( final byte[] bytes ) {
     final var detector = new UniversalDetector( null );
     detector.handleData( bytes, 0, bytes.length );
     detector.dataEnd();
     final String charset = detector.getDetectedCharset();
     return charset == null
         ? Charset.defaultCharset()
         : Charset.forName( charset.toUpperCase( ENGLISH ) );
+  }
   /**
    * Converts the given string to an array of bytes using the encoding that was
    * originally detected (if any) and associated with this file.
+   *
    * @param text The text to convert into the original file encoding.
    * @return A series of bytes ready for writing to a file.
    */
   private byte[] asBytes( final String text ) {
     return text.getBytes( getEncoding() );
+  }
   /**
    * Converts the given bytes into a Java String. This will call setEncoding
    * with the encoding detected by the CharsetDetector.
+   *
    * @param text The text of unknown character encoding.
    * @return The text, in its auto-detected encoding, as a String.
    */
   private String asString( final byte[] text ) {
     setEncoding( detectEncoding( text ) );
     return new String( text, getEncoding() );
+  }
   /**
    * Returns the path to the file being edited in this tab.
+   *
    * @return A non-null instance.
    */
   public Path getPath() {
     return mPath;
+  }
   /**
    * Sets the path to a file for editing and then updates the tab with the
    * file contents.
+   *
    * @param path A non-null instance.
    */
   public void setPath( final Path path ) {
     assert path != null;
     mPath = path;
     updateTab();
+  }
   public boolean isModified() {
     return mModified.get();
+  }
   ReadOnlyBooleanProperty modifiedProperty() {
     return mModified.getReadOnlyProperty();
+  }
   BooleanProperty canUndoProperty() {
     return this.canUndo;
+  }
   BooleanProperty canRedoProperty() {
     return this.canRedo;
+  }
   private UndoManager<?> getUndoManager() {
     return getEditorPane().getUndoManager();
+  }
   /**
    * Forwards to the editor pane's listeners for text change events.
+   *
    * @param listener The listener to notify when the text changes.
    */
   public void addTextChangeListener( final ChangeListener<String> listener ) {
     getEditorPane().addTextChangeListener( listener );
+  }
   /**
    * Forwards to the editor pane's listeners for caret paragraph change events.
+   *
    * @param listener The listener to notify when the caret changes paragraphs.
    */
   public void addCaretParagraphListener(
       final ChangeListener<Integer> listener ) {
     getEditorPane().addCaretParagraphListener( listener );
+  }
   public <T extends Event> void addEventFilter(
       final EventType<T> eventType,
       final EventHandler<? super T> eventFilter ) {
     getEditorPane().getEditor().addEventFilter( eventType, eventFilter );
+  }
   /**
    * Forwards the request to the editor pane.
+   *
    * @return The text to process.
    */
   public String getEditorText() {
     return getEditorPane().getText();
+  }
   /**
    * Returns the editor pane, or creates one if it doesn't yet exist.
+   *
    * @return The editor pane, never null.
    */
   public EditorPane getEditorPane() {
     return mEditorPane;
+  }
   /**
    * Returns the encoding for the file, defaulting to UTF-8 if it hasn't been
    * determined.
+   *
    * @return The file encoding or UTF-8 if unknown.
    */
   private Charset getEncoding() {
     return mEncoding;
+  }
   private void setEncoding( final Charset encoding ) {
     assert encoding != null;
     mEncoding = encoding;
+  }
   private Notifier getNotifier() {
     return mNotifier;
+  }
   /**
    * Returns the tab title, without any modified indicators.
+   *
    * @return The tab title.
    */
   @Override
   public String toString() {
     return getTabTitle();
+  }
+}

A src/main/java/com/scrivenvar/FileEditorTabPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.predicates.files.FileTypePredicate;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Settings;
 import com.scrivenvar.service.events.Notification;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.Utils;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Window;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import static com.scrivenvar.Constants.GLOB_PREFIX_FILE;
 import static com.scrivenvar.FileType.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.service.events.Notifier.YES;
 /**
  * Tab pane for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class FileEditorTabPane extends TabPane {
   private final static String FILTER_EXTENSION_TITLES =
       "Dialog.file.choose.filter";
   private final static Options sOptions = Services.load( Options.class );
   private final static Settings sSettings = Services.load( Settings.class );
   private final static Notifier sNotifier = Services.load( Notifier.class );
   private final ReadOnlyObjectWrapper<Path> openDefinition =
       new ReadOnlyObjectWrapper<>();
   private final ReadOnlyObjectWrapper<FileEditorTab> mActiveFileEditor =
       new ReadOnlyObjectWrapper<>();
   private final ReadOnlyBooleanWrapper anyFileEditorModified =
       new ReadOnlyBooleanWrapper();
   private final Consumer<Double> mScrollEventObserver;
   /**
    * Constructs a new file editor tab pane.
    */
   public FileEditorTabPane( final Consumer<Double> scrollEventObserver ) {
     final ObservableList<Tab> tabs = getTabs();
     setFocusTraversable( false );
     setTabClosingPolicy( TabClosingPolicy.ALL_TABS );
     addTabSelectionListener(
         ( ObservableValue<? extends Tab> tabPane,
           final Tab oldTab, final Tab newTab ) -> {
           if( newTab != null ) {
             mActiveFileEditor.set( (FileEditorTab) newTab );
+          }
+        }
     );
     final ChangeListener<Boolean> modifiedListener = ( observable, oldValue,
                                                        newValue ) -> {
       for( final Tab tab : tabs ) {
         if( ((FileEditorTab) tab).isModified() ) {
           this.anyFileEditorModified.set( true );
           break;
+        }
+      }
     };
     tabs.addListener(
         (ListChangeListener<Tab>) change -> {
           while( change.next() ) {
             if( change.wasAdded() ) {
               change.getAddedSubList().forEach(
                   ( tab ) -> ((FileEditorTab) tab).modifiedProperty()
                                                   .addListener( modifiedListener ) );
+            }
             else if( change.wasRemoved() ) {
               change.getRemoved().forEach(
                   ( tab ) -> ((FileEditorTab) tab).modifiedProperty()
                                                   .removeListener(
                                                       modifiedListener ) );
+            }
+          }
           // Changes in the tabs may also change anyFileEditorModified property
           // (e.g. closed modified file)
           modifiedListener.changed( null, null, null );
+        }
     );
     mScrollEventObserver = scrollEventObserver;
+  }
   /**
    * Allows observers to be notified when the current file editor tab changes.
+   *
    * @param listener The listener to notify of tab change events.
    */
   public void addTabSelectionListener( final ChangeListener<Tab> listener ) {
     // Observe the tab so that when a new tab is opened or selected,
     // a notification is kicked off.
     getSelectionModel().selectedItemProperty().addListener( listener );
+  }
   /**
    * Returns the tab that has keyboard focus.
+   *
    * @return A non-null instance.
    */
   public FileEditorTab getActiveFileEditor() {
     return mActiveFileEditor.get();
+  }
   /**
    * Returns the property corresponding to the tab that has focus.
+   *
    * @return A non-null instance.
    */
   public ReadOnlyObjectProperty<FileEditorTab> activeFileEditorProperty() {
     return mActiveFileEditor.getReadOnlyProperty();
+  }
   /**
    * Property that can answer whether the text has been modified.
+   *
    * @return A non-null instance, true meaning the content has not been saved.
    */
   ReadOnlyBooleanProperty anyFileEditorModifiedProperty() {
     return this.anyFileEditorModified.getReadOnlyProperty();
+  }
   /**
    * Creates a new editor instance from the given path.
+   *
    * @param path The file to open.
    * @return A non-null instance.
    */
   private FileEditorTab createFileEditor( final Path path ) {
     assert path != null;
     final FileEditorTab tab = new FileEditorTab( path );
     tab.getEditorPane().getScrollPane().estimatedScrollYProperty().addObserver(
         mScrollEventObserver
     );
     tab.setOnCloseRequest( e -> {
       if( !canCloseEditor( tab ) ) {
         e.consume();
+      }
       else if( isActiveFileEditor( tab ) ) {
         // Prevent prompting the user to save when there are no file editor
         // tabs open.
         mActiveFileEditor.set( null );
+      }
     } );
     return tab;
+  }
   private boolean isActiveFileEditor( final FileEditorTab tab ) {
     return getActiveFileEditor() == tab;
+  }
   private Path getDefaultPath() {
     final String filename = getDefaultFilename();
     return (new File( filename )).toPath();
+  }
   private String getDefaultFilename() {
     return getSettings().getSetting( "file.default", "untitled.md" );
+  }
   /**
    * Called when the user selects New from the File menu.
    */
   void newEditor() {
     final Path defaultPath = getDefaultPath();
     final FileEditorTab tab = createFileEditor( defaultPath );
     getTabs().add( tab );
     getSelectionModel().select( tab );
+  }
   void openFileDialog() {
     final String title = get( "Dialog.file.choose.open.title" );
     final FileChooser dialog = createFileChooser( title );
     final List<File> files = dialog.showOpenMultipleDialog( getWindow() );
     if( files != null ) {
       openFiles( files );
+    }
+  }
   /**
    * Opens the files into new editors, unless one of those files was a
    * definition file. The definition file is loaded into the definition pane,
    * but only the first one selected (multiple definition files will result in a
    * warning).
+   *
    * @param files The list of non-definition files that the were requested to
    *              open.
    */
   private void openFiles( final List<File> files ) {
     final List<String> extensions =
         createExtensionFilter( DEFINITION ).getExtensions();
     final FileTypePredicate predicate =
         new FileTypePredicate( extensions );
     // The user might have opened multiple definitions files. These will
     // be discarded from the text editable files.
     final List<File> definitions
         = files.stream().filter( predicate ).collect( Collectors.toList() );
     // Create a modifiable list to remove any definition files that were
     // opened.
     final List<File> editors = new ArrayList<>( files );
     if( !editors.isEmpty() ) {
       saveLastDirectory( editors.get( 0 ) );
+    }
     editors.removeAll( definitions );
     // Open editor-friendly files (e.g,. Markdown, XML) in new tabs.
     if( !editors.isEmpty() ) {
       openEditors( editors, 0 );
+    }
     if( !definitions.isEmpty() ) {
       openDefinition( definitions.get( 0 ) );
+    }
+  }
   private void openEditors( final List<File> files, final int activeIndex ) {
     final int fileTally = files.size();
     final List<Tab> tabs = getTabs();
     // Close single unmodified "Untitled" tab.
     if( tabs.size() == 1 ) {
       final FileEditorTab fileEditor = (FileEditorTab) (tabs.get( 0 ));
       if( fileEditor.getPath() == null && !fileEditor.isModified() ) {
         closeEditor( fileEditor, false );
+      }
+    }
     for( int i = 0; i < fileTally; i++ ) {
       final Path path = files.get( i ).toPath();
       FileEditorTab fileEditorTab = findEditor( path );
       // Only open new files.
       if( fileEditorTab == null ) {
         fileEditorTab = createFileEditor( path );
         getTabs().add( fileEditorTab );
+      }
       // Select the first file in the list.
       if( i == activeIndex ) {
         getSelectionModel().select( fileEditorTab );
+      }
+    }
+  }
   /**
    * Returns a property that changes when a new definition file is opened.
+   *
    * @return The path to a definition file that was opened.
    */
   public ReadOnlyObjectProperty<Path> onOpenDefinitionFileProperty() {
     return getOnOpenDefinitionFile().getReadOnlyProperty();
+  }
   private ReadOnlyObjectWrapper<Path> getOnOpenDefinitionFile() {
     return this.openDefinition;
+  }
   /**
    * Called when the user has opened a definition file (using the file open
    * dialog box). This will replace the current set of definitions for the
    * active tab.
+   *
    * @param definition The file to open.
    */
   private void openDefinition( final File definition ) {
     // TODO: Prevent reading this file twice when a new text document is opened.
     // (might be a matter of checking the value first).
     getOnOpenDefinitionFile().set( definition.toPath() );
+  }
   /**
    * Called when the contents of the editor are to be saved.
+   *
    * @param tab The tab containing content to save.
    * @return true The contents were saved (or needn't be saved).
    */
   public boolean saveEditor( final FileEditorTab tab ) {
     if( tab == null || !tab.isModified() ) {
       return true;
+    }
     return tab.getPath() == null ? saveEditorAs( tab ) : tab.save();
+  }
   /**
    * Opens the Save As dialog for the user to save the content under a new
    * path.
+   *
    * @param tab The tab with contents to save.
    * @return true The contents were saved, or the tab was null.
    */
   public boolean saveEditorAs( final FileEditorTab tab ) {
     if( tab == null ) {
       return true;
+    }
     getSelectionModel().select( tab );
     final FileChooser fileChooser = createFileChooser( get(
         "Dialog.file.choose.save.title" ) );
     final File file = fileChooser.showSaveDialog( getWindow() );
     if( file == null ) {
       return false;
+    }
     saveLastDirectory( file );
     tab.setPath( file.toPath() );
     return tab.save();
+  }
   void saveAllEditors() {
     for( final FileEditorTab fileEditor : getAllEditors() ) {
       saveEditor( fileEditor );
+    }
+  }
   /**
    * Answers whether the file has had modifications. '
+   *
    * @param tab THe tab to check for modifications.
    * @return false The file is unmodified.
    */
   @SuppressWarnings("BooleanMethodIsAlwaysInverted")
   boolean canCloseEditor( final FileEditorTab tab ) {
     final AtomicReference<Boolean> canClose = new AtomicReference<>();
     canClose.set( true );
     if( tab.isModified() ) {
       final Notification message = getNotifyService().createNotification(
           Messages.get( "Alert.file.close.title" ),
           Messages.get( "Alert.file.close.text" ),
           tab.getText()
       );
       final Alert confirmSave = getNotifyService().createConfirmation(
           getWindow(), message );
       final Optional<ButtonType> buttonType = confirmSave.showAndWait();
       buttonType.ifPresent(
           save -> canClose.set(
               save == YES ? saveEditor( tab ) : save == ButtonType.NO
+          )
       );
+    }
     return canClose.get();
+  }
   boolean closeEditor( final FileEditorTab tab, final boolean save ) {
     if( tab == null ) {
       return true;
+    }
     if( save ) {
       Event event = new Event( tab, tab, Tab.TAB_CLOSE_REQUEST_EVENT );
       Event.fireEvent( tab, event );
       if( event.isConsumed() ) {
         return false;
+      }
+    }
     getTabs().remove( tab );
     if( tab.getOnClosed() != null ) {
       Event.fireEvent( tab, new Event( Tab.CLOSED_EVENT ) );
+    }
     return true;
+  }
   boolean closeAllEditors() {
     final FileEditorTab[] allEditors = getAllEditors();
     final FileEditorTab activeEditor = getActiveFileEditor();
     // try to save active tab first because in case the user decides to cancel,
     // then it stays active
     if( activeEditor != null && !canCloseEditor( activeEditor ) ) {
       return false;
+    }
     // This should be called any time a tab changes.
     persistPreferences();
     // save modified tabs
     for( int i = 0; i < allEditors.length; i++ ) {
       final FileEditorTab fileEditor = allEditors[ i ];
       if( fileEditor == activeEditor ) {
         continue;
+      }
       if( fileEditor.isModified() ) {
         // activate the modified tab to make its modified content visible to
         // the user
         getSelectionModel().select( i );
         if( !canCloseEditor( fileEditor ) ) {
           return false;
+        }
+      }
+    }
     // Close all tabs.
     for( final FileEditorTab fileEditor : allEditors ) {
       if( !closeEditor( fileEditor, false ) ) {
         return false;
+      }
+    }
     return getTabs().isEmpty();
+  }
   private FileEditorTab[] getAllEditors() {
     final ObservableList<Tab> tabs = getTabs();
     final int length = tabs.size();
     final FileEditorTab[] allEditors = new FileEditorTab[ length ];
     for( int i = 0; i < length; i++ ) {
       allEditors[ i ] = (FileEditorTab) tabs.get( i );
+    }
     return allEditors;
+  }
   /**
    * Returns the file editor tab that has the given path.
+   *
    * @return null No file editor tab for the given path was found.
    */
   private FileEditorTab findEditor( final Path path ) {
     for( final Tab tab : getTabs() ) {
       final FileEditorTab fileEditor = (FileEditorTab) tab;
       if( fileEditor.isPath( path ) ) {
         return fileEditor;
+      }
+    }
     return null;
+  }
   private FileChooser createFileChooser( String title ) {
     final FileChooser fileChooser = new FileChooser();
     fileChooser.setTitle( title );
     fileChooser.getExtensionFilters().addAll(
         createExtensionFilters() );
     final String lastDirectory = getPreferences().get( "lastDirectory", null );
     File file = new File( (lastDirectory != null) ? lastDirectory : "." );
     if( !file.isDirectory() ) {
       file = new File( "." );
+    }
     fileChooser.setInitialDirectory( file );
     return fileChooser;
+  }
   private List<ExtensionFilter> createExtensionFilters() {
     final List<ExtensionFilter> list = new ArrayList<>();
     // TODO: Return a list of all properties that match the filter prefix.
     // This will allow dynamic filters to be added and removed just by
     // updating the properties file.
     list.add( createExtensionFilter( ALL ) );
     list.add( createExtensionFilter( SOURCE ) );
     list.add( createExtensionFilter( DEFINITION ) );
     list.add( createExtensionFilter( XML ) );
     return list;
+  }
   /**
    * Returns a filter for file name extensions recognized by the application
    * that can be opened by the user.
+   *
    * @param filetype Used to find the globbing pattern for extensions.
    * @return A filename filter suitable for use by a FileDialog instance.
    */
   private ExtensionFilter createExtensionFilter( final FileType filetype ) {
     final String tKey = String.format( "%s.title.%s",
                                        FILTER_EXTENSION_TITLES,
                                        filetype );
     final String eKey = String.format( "%s.%s", GLOB_PREFIX_FILE, filetype );
     return new ExtensionFilter( Messages.get( tKey ), getExtensions( eKey ) );
+  }
   private List<String> getExtensions( final String key ) {
     return getSettings().getStringSettingList( key );
+  }
   private void saveLastDirectory( final File file ) {
     getPreferences().put( "lastDirectory", file.getParent() );
+  }
   public void restorePreferences() {
     int activeIndex = 0;
     final Preferences preferences = getPreferences();
     final String[] fileNames = Utils.getPrefsStrings( preferences, "file" );
     final String activeFileName = preferences.get( "activeFile", null );
     final List<File> files = new ArrayList<>( fileNames.length );
     for( final String fileName : fileNames ) {
       final File file = new File( fileName );
       if( file.exists() ) {
         files.add( file );
         if( fileName.equals( activeFileName ) ) {
           activeIndex = files.size() - 1;
+        }
+      }
+    }
     if( files.isEmpty() ) {
       newEditor();
+    }
     else {
       openEditors( files, activeIndex );
+    }
+  }
   public void persistPreferences() {
     final ObservableList<Tab> allEditors = getTabs();
     final List<String> fileNames = new ArrayList<>( allEditors.size() );
     for( final Tab tab : allEditors ) {
       final FileEditorTab fileEditor = (FileEditorTab) tab;
       final Path filePath = fileEditor.getPath();
       if( filePath != null ) {
         fileNames.add( filePath.toString() );
+      }
+    }
     final Preferences preferences = getPreferences();
     Utils.putPrefsStrings( preferences,
                            "file",
                            fileNames.toArray( new String[ 0 ] ) );
     final FileEditorTab activeEditor = getActiveFileEditor();
     final Path filePath = activeEditor == null ? null : activeEditor.getPath();
     if( filePath == null ) {
       preferences.remove( "activeFile" );
+    }
     else {
       preferences.put( "activeFile", filePath.toString() );
+    }
+  }
   private Notifier getNotifyService() {
     return sNotifier;
+  }
   private Settings getSettings() {
     return sSettings;
+  }
   protected Options getOptions() {
     return sOptions;
+  }
   private Window getWindow() {
     return getScene().getWindow();
+  }
   private Preferences getPreferences() {
     return getOptions().getState();
+  }
   Node getNode() {
     return this;
+  }
+}

A src/main/java/com/scrivenvar/FileType.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 /**
  * Represents different file type classifications. These are high-level mappings
  * that correspond to the list of glob patterns found within
  * settings.properties.
+ *
  * @author White Magic Software, Ltd.
  */
 public enum FileType {
   ALL( "all" ),
   RMARKDOWN( "rmarkdown" ),
   RXML( "rxml" ),
   SOURCE( "source" ),
   DEFINITION( "definition" ),
   XML( "xml" ),
   CSV( "csv" ),
   JSON( "json" ),
   TOML( "toml" ),
   YAML( "yaml" ),
   PROPERTIES( "properties" );
   private final String mType;
   /**
    * Default constructor for enumerated file type.
+   *
    * @param type Human-readable name for the file type.
    */
   FileType( final String type ) {
     mType = type;
+  }
   /**
    * Returns the file type that corresponds to the given string.
+   *
    * @param type The string to compare against this enumeration of file types.
+   *
    * @return The corresponding File Type for the given string.
+   *
    * @throws IllegalArgumentException Type not found.
    */
   public static FileType from( final String type ) {
     for( final FileType fileType : FileType.values() ) {
       if( fileType.isType( type ) ) {
         return fileType;
+      }
+    }
     throw new IllegalArgumentException( type );
+  }
   /**
    * Answers whether this file type matches the given string, case insensitive
    * comparison.
+   *
    * @param type Presumably a file name extension to check against.
+   *
    * @return true The given extension corresponds to this enumerated type.
    */
   public boolean isType( final String type ) {
     return getType().equalsIgnoreCase( type );
+  }
   /**
    * Returns the human-readable name for the file type.
+   *
    * @return A non-null instance.
    */
   private String getType() {
     return mType;
+  }
   /**
    * Returns the lowercase version of the file name extension.
+   *
    * @return The file name, in lower case.
    */
   @Override
   public String toString() {
     return getType();
+  }
+}

A src/main/java/com/scrivenvar/Launcher.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Calendar;
 import java.util.Properties;
 import static java.lang.String.format;
 /**
  * Launches the application using the {@link Main} class.
+ *
  * <p>
  * This is required until modules are implemented, which may never happen
  * because the application should be ported away from Java and JavaFX.
  * </p>
  */
 public class Launcher {
   /**
    * Delegates to the application entry point.
+   *
    * @param args Command-line arguments.
    */
   public static void main( final String[] args ) throws IOException {
     // Shhh.
     System.err.close();
     showAppInfo();
     Main.main( args );
+  }
   @SuppressWarnings("RedundantStringFormatCall")
   private static void showAppInfo() throws IOException {
     out( format( "%s version %s", getTitle(), getVersion() ) );
     out( format( "Copyright %s by White Magic Software, Ltd.", getYear() ) );
     out( format( "Portions copyright 2020 Karl Tauber." ) );
+  }
   private static void out( final String s ) {
     System.out.println( s );
+  }
   private static String getTitle() throws IOException {
     final Properties properties = loadProperties( "messages.properties" );
     return properties.getProperty( "Main.title" );
+  }
   private static String getVersion() throws IOException {
     final Properties properties = loadProperties( "app.properties" );
     return properties.getProperty( "application.version" );
+  }
   private static String getYear() {
     return Integer.toString( Calendar.getInstance().get( Calendar.YEAR ) );
+  }
   @SuppressWarnings("SameParameterValue")
   private static Properties loadProperties( final String resource )
       throws IOException {
     final Properties properties = new Properties();
     properties.load( getResourceAsStream( getResourceName( resource ) ) );
     return properties;
+  }
   private static String getResourceName( final String resource ) {
     return format( "%s/%s", getPackagePath(), resource );
+  }
   private static String getPackagePath() {
     return Launcher.class.getPackageName().replace( '.', '/' );
+  }
   private static InputStream getResourceAsStream( final String resource ) {
     return Launcher.class.getClassLoader().getResourceAsStream( resource );
+  }
+}

A src/main/java/com/scrivenvar/Main.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.preferences.FilePreferencesFactory;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Snitch;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.StageState;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import java.util.logging.LogManager;
 import static com.scrivenvar.Constants.*;
 import static com.scrivenvar.Messages.get;
 /**
  * Application entry point. The application allows users to edit Markdown
  * files and see a real-time preview of the edits.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class Main extends Application {
   // Suppress logging errors to standard output.
   static {
     LogManager.getLogManager().reset();
+  }
   private static Application sApplication;
   private final Options mOptions = Services.load( Options.class );
   private final Notifier mNotifier = Services.load( Notifier.class );
   private final Snitch mSnitch = Services.load( Snitch.class );
   private final Thread mSnitchThread = new Thread( getSnitch() );
   private final MainWindow mMainWindow = new MainWindow();
   @SuppressWarnings({"FieldCanBeLocal", "unused"})
   private StageState mStageState;
   /**
    * Application entry point.
+   *
    * @param args Command-line arguments.
    */
   public static void main( final String[] args ) {
     initPreferences();
     launch( args );
+  }
   /**
    * JavaFX entry point.
+   *
    * @param stage The primary application stage.
    */
   @Override
   public void start( final Stage stage ) {
     initApplication();
     initNotifyService();
     initState( stage );
     initStage( stage );
     initSnitch();
     stage.show();
+  }
   /**
    * Sets the factory used for reading user preferences.
    */
   private static void initPreferences() {
     System.setProperty(
         "java.util.prefs.PreferencesFactory",
         FilePreferencesFactory.class.getName()
     );
+  }
   public static void showDocument( final String uri ) {
     getApplication().getHostServices().showDocument( uri );
+  }
   private void initApplication() {
     sApplication = this;
+  }
   /**
    * Constructs the notify service and appends the main window to the list of
    * notification observers.
    */
   private void initNotifyService() {
     mNotifier.addObserver( getMainWindow() );
+  }
   private void initState( final Stage stage ) {
     mStageState = new StageState( stage, getOptions().getState() );
+  }
   private void initStage( final Stage stage ) {
     stage.getIcons().addAll(
         createImage( FILE_LOGO_16 ),
         createImage( FILE_LOGO_32 ),
         createImage( FILE_LOGO_128 ),
         createImage( FILE_LOGO_256 ),
         createImage( FILE_LOGO_512 ) );
     stage.setTitle( getApplicationTitle() );
     stage.setScene( getScene() );
+  }
   /**
    * Watch for file system changes.
    */
   private void initSnitch() {
     getSnitchThread().start();
+  }
   /**
    * Stops the snitch service, if its running.
+   *
    * @throws InterruptedException Couldn't stop the snitch thread.
    */
   @Override
   public void stop() throws InterruptedException {
     getSnitch().stop();
     final Thread thread = getSnitchThread();
     thread.interrupt();
     thread.join();
+  }
   private synchronized Snitch getSnitch() {
     return mSnitch;
+  }
   private Thread getSnitchThread() {
     return mSnitchThread;
+  }
   private synchronized Options getOptions() {
     return mOptions;
+  }
   private Scene getScene() {
     return getMainWindow().getScene();
+  }
   private MainWindow getMainWindow() {
     return mMainWindow;
+  }
   private static Application getApplication() {
     return sApplication;
+  }
   private String getApplicationTitle() {
     return get( "Main.title" );
+  }
   private Image createImage( final String filename ) {
     return new Image( filename );
+  }
+}

A src/main/java/com/scrivenvar/MainWindow.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.definition.DefinitionFactory;
 import com.scrivenvar.definition.DefinitionPane;
 import com.scrivenvar.definition.DefinitionSource;
 import com.scrivenvar.definition.MapInterpolator;
 import com.scrivenvar.definition.yaml.YamlDefinitionSource;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.editors.VariableNameInjector;
 import com.scrivenvar.editors.markdown.MarkdownEditorPane;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import com.scrivenvar.processors.Processor;
 import com.scrivenvar.processors.ProcessorFactory;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Snitch;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.Action;
 import com.scrivenvar.util.ActionBuilder;
 import com.scrivenvar.util.ActionUtils;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import org.controlsfx.control.StatusBar;
 import org.fxmisc.richtext.model.TwoDimensional.Position;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.prefs.Preferences;
 import static com.scrivenvar.Constants.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.util.StageState.*;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.*;
 import static javafx.event.Event.fireEvent;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.TAB;
 import static javafx.stage.WindowEvent.WINDOW_CLOSE_REQUEST;
 /**
  * Main window containing a tab pane in the center for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class MainWindow implements Observer {
   /**
    * The {@code OPTIONS} variable must be declared before all other variables
    * to prevent subsequent initializations from failing due to missing user
    * preferences.
    */
   private final static Options OPTIONS = Services.load( Options.class );
   private final static Snitch SNITCH = Services.load( Snitch.class );
   private final static Notifier NOTIFIER = Services.load( Notifier.class );
   private final Scene mScene;
   private final StatusBar mStatusBar;
   private final Text mLineNumberText;
   private final TextField mFindTextField;
   private DefinitionSource mDefinitionSource = createDefaultDefinitionSource();
   private final DefinitionPane mDefinitionPane = new DefinitionPane();
   private final HTMLPreviewPane mPreviewPane = createHTMLPreviewPane();
   private FileEditorTabPane fileEditorPane;
   /**
    * Prevents re-instantiation of processing classes.
    */
   private final Map<FileEditorTab, Processor<String>> mProcessors =
       new HashMap<>();
   private final Map<String, String> mResolvedMap =
       new HashMap<>( DEFAULT_MAP_SIZE );
   /**
    * Listens on the definition pane for double-click events.
    */
   private VariableNameInjector variableNameInjector;
   /**
    * Called when the definition data is changed.
    */
   private final EventHandler<TreeItem.TreeModificationEvent<Event>>
       mTreeHandler = event -> {
     exportDefinitions( getDefinitionPath() );
     interpolateResolvedMap();
     refreshActiveTab();
   };
   /**
    * Called to inject the selected item when the user presses ENTER in the
    * definition pane.
    */
   private final EventHandler<? super KeyEvent> mDefinitionKeyHandler =
       event -> {
         if( event.getCode() == ENTER ) {
           getVariableNameInjector().injectSelectedItem();
+        }
       };
   /**
    * Called to switch to the definition pane when the user presses TAB.
    */
   private final EventHandler<? super KeyEvent> mEditorKeyHandler =
       (EventHandler<KeyEvent>) event -> {
         if( event.getCode() == TAB ) {
           getDefinitionPane().requestFocus();
           event.consume();
+        }
       };
   private final Object mMutex = new Object();
   private final AtomicInteger mScrollRatio = new AtomicInteger( 0 );
   /**
    * Called to synchronize the scrolling areas.
    */
   private final Consumer<Double> mScrollEventObserver = o -> {
     final var eScrollPane = getActiveEditor().getScrollPane();
     final int eScrollY =
         eScrollPane.estimatedScrollYProperty().getValue().intValue();
     final int eHeight = (int)
         (eScrollPane.totalHeightEstimateProperty().getValue().intValue()
             - eScrollPane.getHeight());
     final double eRatio = eHeight > 0
         ? Math.min( Math.max( eScrollY / (float) eHeight, 0 ), 1 ) : 0;
     final var pPreviewPane = getPreviewPane();
     final var pScrollBar = pPreviewPane.getVerticalScrollBar();
     final var pHeight = pScrollBar.getMaximum() - pScrollBar.getHeight();
     final var pScrollY = (int) (pHeight * eRatio);
     final var pScrollPane = pPreviewPane.getScrollPane();
     final int oldScrollY = mScrollRatio.getAndSet( pScrollY );
     final int delta = Math.abs( oldScrollY - pScrollY );
     if( delta > 33 ) {
       // Prevent concurrent modification exceptions when attempting to
       // set the vertical scroll bar position.
       synchronized( mMutex ) {
         Platform.runLater( () -> {
           pScrollBar.setValue( pScrollY );
           pScrollPane.repaint();
         } );
+      }
+    }
   };
   public MainWindow() {
     mStatusBar = createStatusBar();
     mLineNumberText = createLineNumberText();
     mFindTextField = createFindTextField();
     mScene = createScene();
     initLayout();
     initFindInput();
     initSnitch();
     initDefinitionListener();
     initTabAddedListener();
     initTabChangedListener();
     restorePreferences();
+  }
   private void initLayout() {
     final Scene appScene = getScene();
     appScene.getStylesheets().add( STYLESHEET_SCENE );
     // TODO: Apply an XML syntax highlighting for XML files.
 //    appScene.getStylesheets().add( STYLESHEET_XML );
     appScene.windowProperty().addListener(
         ( observable, oldWindow, newWindow ) ->
             newWindow.setOnCloseRequest(
                 e -> {
                   if( !getFileEditorPane().closeAllEditors() ) {
                     e.consume();
+                  }
+                }
+            )
     );
+  }
   /**
    * Initialize the find input text field to listen on F3, ENTER, and ESCAPE key
    * presses.
    */
   private void initFindInput() {
     final TextField input = getFindTextField();
     input.setOnKeyPressed( ( KeyEvent event ) -> {
       switch( event.getCode() ) {
         case F3:
         case ENTER:
           editFindNext();
           break;
         case F:
           if( !event.isControlDown() ) {
             break;
+          }
         case ESCAPE:
           getStatusBar().setGraphic( null );
           getActiveFileEditor().getEditorPane().requestFocus();
           break;
+      }
     } );
     // Remove when the input field loses focus.
     input.focusedProperty().addListener(
+        (
             final ObservableValue<? extends Boolean> focused,
             final Boolean oFocus,
             final Boolean nFocus ) -> {
           if( !nFocus ) {
             getStatusBar().setGraphic( null );
+          }
+        }
     );
+  }
   /**
    * Watch for changes to external files. In particular, this awaits
    * modifications to any XSL files associated with XML files being edited. When
    * an XSL file is modified (external to the application), the snitch's ears
    * perk up and the file is reloaded. This keeps the XSL transformation up to
    * date with what's on the file system.
    */
   private void initSnitch() {
     SNITCH.addObserver( this );
+  }
   /**
    * Listen for {@link FileEditorTabPane} to receive open definition file event.
    */
   private void initDefinitionListener() {
     getFileEditorPane().onOpenDefinitionFileProperty().addListener(
         ( final ObservableValue<? extends Path> file,
           final Path oldPath, final Path newPath ) -> {
           // Indirectly refresh the resolved map.
           resetProcessors();
           openDefinitions( newPath );
           // Will create new processors and therefore a new resolved map.
           refreshActiveTab();
+        }
     );
+  }
   /**
    * When tabs are added, hook the various change listeners onto the new tab so
    * that the preview pane refreshes as necessary.
    */
   private void initTabAddedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Make sure the text processor kicks off when new files are opened.
     final ObservableList<Tab> tabs = editorPane.getTabs();
     // Update the preview pane on tab changes.
     tabs.addListener(
         ( final Change<? extends Tab> change ) -> {
           while( change.next() ) {
             if( change.wasAdded() ) {
               // Multiple tabs can be added simultaneously.
               for( final Tab newTab : change.getAddedSubList() ) {
                 final FileEditorTab tab = (FileEditorTab) newTab;
                 initTextChangeListener( tab );
                 initKeyboardEventListeners( tab );
 //              initSyntaxListener( tab );
+              }
+            }
+          }
+        }
     );
+  }
   /**
    * Listen for new tab selection events.
    */
   private void initTabChangedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Update the preview pane changing tabs.
     editorPane.addTabSelectionListener(
         ( ObservableValue<? extends Tab> tabPane,
           final Tab oldTab, final Tab newTab ) -> {
           updateVariableNameInjector();
           // If there was no old tab, then this is a first time load, which
           // can be ignored.
           if( oldTab != null ) {
             if( newTab == null ) {
               closeRemainingTab();
+            }
             else {
               // Update the preview with the edited text.
               refreshSelectedTab( (FileEditorTab) newTab );
+            }
+          }
+        }
     );
+  }
   /**
    * Reloads the preferences from the previous session.
    */
   private void restorePreferences() {
     restoreDefinitionPane();
     getFileEditorPane().restorePreferences();
+  }
   /**
    * Ensure that the keyboard events are received when a new tab is added
    * to the user interface.
+   *
    * @param tab The tab that can trigger keyboard events, such as control+space.
    */
   private void initKeyboardEventListeners( final FileEditorTab tab ) {
     final VariableNameInjector vin = getVariableNameInjector();
     vin.initKeyboardEventListeners( tab );
     tab.addEventFilter( KeyEvent.KEY_PRESSED, mEditorKeyHandler );
+  }
   private void initTextChangeListener( final FileEditorTab tab ) {
     tab.addTextChangeListener(
         ( ObservableValue<? extends String> editor,
           final String oldValue, final String newValue ) ->
             refreshSelectedTab( tab )
     );
+  }
   private void updateVariableNameInjector() {
     getVariableNameInjector().setFileEditorTab( getActiveFileEditor() );
+  }
   private void setVariableNameInjector( final VariableNameInjector injector ) {
     this.variableNameInjector = injector;
+  }
   private synchronized VariableNameInjector getVariableNameInjector() {
     if( this.variableNameInjector == null ) {
       final VariableNameInjector vin = createVariableNameInjector();
       setVariableNameInjector( vin );
+    }
     return this.variableNameInjector;
+  }
   private VariableNameInjector createVariableNameInjector() {
     final FileEditorTab tab = getActiveFileEditor();
     final DefinitionPane pane = getDefinitionPane();
     return new VariableNameInjector( tab, pane );
+  }
   /**
    * Called whenever the preview pane becomes out of sync with the file editor
    * tab. This can be called when the text changes, the caret paragraph changes,
    * or the file tab changes.
+   *
    * @param tab The file editor tab that has been changed in some fashion.
    */
   private void refreshSelectedTab( final FileEditorTab tab ) {
     if( tab == null ) {
       return;
+    }
     getPreviewPane().setPath( tab.getPath() );
     // TODO: https://github.com/DaveJarvis/scrivenvar/issues/29
     final Position p = tab.getCaretOffset();
     getLineNumberText().setText(
         get( STATUS_BAR_LINE,
              p.getMajor() + 1,
              p.getMinor() + 1,
              tab.getCaretPosition() + 1
+        )
     );
     Processor<String> processor = getProcessors().get( tab );
     if( processor == null ) {
       processor = createProcessor( tab );
       getProcessors().put( tab, processor );
+    }
     try {
       processor.processChain( tab.getEditorText() );
     } catch( final Exception ex ) {
       error( ex );
+    }
+  }
   private void refreshActiveTab() {
     refreshSelectedTab( getActiveFileEditor() );
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinitions( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path );
       setDefinitionSource( ds );
       getUserPreferences().definitionPathProperty().setValue( path.toFile() );
       getUserPreferences().save();
       final Tooltip tooltipPath = new Tooltip( path.toString() );
       tooltipPath.setShowDelay( Duration.millis( 200 ) );
       final DefinitionPane pane = getDefinitionPane();
       pane.update( ds );
       pane.addTreeChangeHandler( mTreeHandler );
       pane.addKeyEventHandler( mDefinitionKeyHandler );
       pane.filenameProperty().setValue( path.getFileName().toString() );
       pane.setTooltip( tooltipPath );
       interpolateResolvedMap();
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void exportDefinitions( final Path path ) {
     try {
       final DefinitionPane pane = getDefinitionPane();
       final TreeItem<String> root = pane.getTreeView().getRoot();
       final TreeItem<String> problemChild = pane.isTreeWellFormed();
       if( problemChild == null ) {
         getDefinitionSource().getTreeAdapter().export( root, path );
         getNotifier().clear();
+      }
       else {
         final String msg = get( "yaml.error.tree.form",
                                 problemChild.getValue() );
         getNotifier().notify( msg );
+      }
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void interpolateResolvedMap() {
     final Map<String, String> treeMap = getDefinitionPane().toMap();
     final Map<String, String> map = new HashMap<>( treeMap );
     MapInterpolator.interpolate( map );
     getResolvedMap().clear();
     getResolvedMap().putAll( map );
+  }
   private void restoreDefinitionPane() {
     openDefinitions( getDefinitionPath() );
+  }
   /**
    * Called when the last open tab is closed to clear the preview pane.
    */
   private void closeRemainingTab() {
     getPreviewPane().clear();
+  }
   /**
    * Called when an exception occurs that warrants the user's attention.
+   *
    * @param e The exception with a message that the user should know about.
    */
   private void error( final Exception e ) {
     getNotifier().notify( e );
+  }
   //---- File actions -------------------------------------------------------
   /**
    * Called when an observable instance has changed. This is called by both the
    * snitch service and the notify service. The snitch service can be called for
    * different file types, including definition sources.
+   *
    * @param observable The observed instance.
    * @param value      The noteworthy item.
    */
   @Override
   public void update( final Observable observable, final Object value ) {
     if( value != null ) {
       if( observable instanceof Snitch && value instanceof Path ) {
         updateSelectedTab();
+      }
       else if( observable instanceof Notifier && value instanceof String ) {
         updateStatusBar( (String) value );
+      }
+    }
+  }
   /**
    * Updates the status bar to show the given message.
+   *
    * @param s The message to show in the status bar.
    */
   private void updateStatusBar( final String s ) {
     Platform.runLater(
         () -> {
           final int index = s.indexOf( '\n' );
           final String message = s.substring(
 , index > 0 ? index : s.length() );
           getStatusBar().setText( message );
+        }
     );
+  }
   /**
    * Called when a file has been modified.
    */
   private void updateSelectedTab() {
     Platform.runLater(
         () -> {
           // Brute-force XSLT file reload by re-instantiating all processors.
           resetProcessors();
           refreshActiveTab();
+        }
     );
+  }
   /**
    * After resetting the processors, they will refresh anew to be up-to-date
    * with the files (text and definition) currently loaded into the editor.
    */
   private void resetProcessors() {
     getProcessors().clear();
+  }
   //---- File actions -------------------------------------------------------
   private void fileNew() {
     getFileEditorPane().newEditor();
+  }
   private void fileOpen() {
     getFileEditorPane().openFileDialog();
+  }
   private void fileClose() {
     getFileEditorPane().closeEditor( getActiveFileEditor(), true );
+  }
   /**
    * TODO: Upon closing, first remove the tab change listeners. (There's no
    * need to re-render each tab when all are being closed.)
    */
   private void fileCloseAll() {
     getFileEditorPane().closeAllEditors();
+  }
   private void fileSave() {
     getFileEditorPane().saveEditor( getActiveFileEditor() );
+  }
   private void fileSaveAs() {
     final FileEditorTab editor = getActiveFileEditor();
     getFileEditorPane().saveEditorAs( editor );
     getProcessors().remove( editor );
     try {
       refreshSelectedTab( editor );
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   private void fileSaveAll() {
     getFileEditorPane().saveAllEditors();
+  }
   private void fileExit() {
     final Window window = getWindow();
     fireEvent( window, new WindowEvent( window, WINDOW_CLOSE_REQUEST ) );
+  }
   //---- Edit actions -------------------------------------------------------
   /**
    * Used to find text in the active file editor window.
    */
   private void editFind() {
     final TextField input = getFindTextField();
     getStatusBar().setGraphic( input );
     input.requestFocus();
+  }
   public void editFindNext() {
     getActiveFileEditor().searchNext( getFindTextField().getText() );
+  }
   public void editPreferences() {
     getUserPreferences().show();
+  }
   //---- Insert actions -----------------------------------------------------
   /**
    * Delegates to the active editor to handle wrapping the current text
    * selection with leading and trailing strings.
+   *
    * @param leading  The string to put before the selection.
    * @param trailing The string to put after the selection.
    */
   private void insertMarkdown(
       final String leading, final String trailing ) {
     getActiveEditor().surroundSelection( leading, trailing );
+  }
   @SuppressWarnings("SameParameterValue")
   private void insertMarkdown(
       final String leading, final String trailing, final String hint ) {
     getActiveEditor().surroundSelection( leading, trailing, hint );
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     final Alert alert = new Alert( AlertType.INFORMATION );
     alert.setTitle( get( "Dialog.about.title" ) );
     alert.setHeaderText( get( "Dialog.about.header" ) );
     alert.setContentText( get( "Dialog.about.content" ) );
     alert.setGraphic( new ImageView( new Image( FILE_LOGO_32 ) ) );
     alert.initOwner( getWindow() );
     alert.showAndWait();
+  }
   //---- Member creators ----------------------------------------------------
   /**
    * Factory to create processors that are suited to different file types.
+   *
    * @param tab The tab that is subjected to processing.
    * @return A processor suited to the file type specified by the tab's path.
    */
   private Processor<String> createProcessor( final FileEditorTab tab ) {
     return createProcessorFactory().createProcessor( tab );
+  }
   private ProcessorFactory createProcessorFactory() {
     return new ProcessorFactory( getPreviewPane(), getResolvedMap() );
+  }
   private HTMLPreviewPane createHTMLPreviewPane() {
     return new HTMLPreviewPane();
+  }
   private DefinitionSource createDefaultDefinitionSource() {
     return new YamlDefinitionSource( getDefinitionPath() );
+  }
   private DefinitionSource createDefinitionSource( final Path path ) {
     try {
       return createDefinitionFactory().createDefinitionSource( path );
     } catch( final Exception ex ) {
       error( ex );
       return createDefaultDefinitionSource();
+    }
+  }
   private TextField createFindTextField() {
     return new TextField();
+  }
   /**
    * Create an editor pane to hold file editor tabs.
+   *
    * @return A new instance, never null.
    */
   private FileEditorTabPane createFileEditorPane() {
     return new FileEditorTabPane( mScrollEventObserver );
+  }
   private DefinitionFactory createDefinitionFactory() {
     return new DefinitionFactory();
+  }
   private StatusBar createStatusBar() {
     return new StatusBar();
+  }
   private Scene createScene() {
     final SplitPane splitPane = new SplitPane(
         getDefinitionPane().getNode(),
         getFileEditorPane().getNode(),
         getPreviewPane().getNode() );
     splitPane.setDividerPositions(
         getFloat( K_PANE_SPLIT_DEFINITION, .10f ),
         getFloat( K_PANE_SPLIT_EDITOR, .45f ),
         getFloat( K_PANE_SPLIT_PREVIEW, .45f ) );
     getDefinitionPane().prefHeightProperty().bind( splitPane.heightProperty() );
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox statusBar = new VBox();
     statusBar.setAlignment( Pos.BASELINE_CENTER );
     statusBar.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( statusBar );
     return new Scene( borderPane );
+  }
   private Text createLineNumberText() {
     return new Text( get( STATUS_BAR_LINE, 1, 1, 1 ) );
+  }
   private Node createMenuBar() {
     final BooleanBinding activeFileEditorIsNull =
         getFileEditorPane().activeFileEditorProperty().isNull();
     // File actions
     final Action fileNewAction = new ActionBuilder()
         .setText( "Main.menu.file.new" )
         .setAccelerator( "Shortcut+N" )
         .setIcon( FILE_ALT )
         .setAction( e -> fileNew() )
         .build();
     final Action fileOpenAction = new ActionBuilder()
         .setText( "Main.menu.file.open" )
         .setAccelerator( "Shortcut+O" )
         .setIcon( FOLDER_OPEN_ALT )
         .setAction( e -> fileOpen() )
         .build();
     final Action fileCloseAction = new ActionBuilder()
         .setText( "Main.menu.file.close" )
         .setAccelerator( "Shortcut+W" )
         .setAction( e -> fileClose() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action fileCloseAllAction = new ActionBuilder()
         .setText( "Main.menu.file.close_all" )
         .setAction( e -> fileCloseAll() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action fileSaveAction = new ActionBuilder()
         .setText( "Main.menu.file.save" )
         .setAccelerator( "Shortcut+S" )
         .setIcon( FLOPPY_ALT )
         .setAction( e -> fileSave() )
         .setDisable( createActiveBooleanProperty(
             FileEditorTab::modifiedProperty ).not() )
         .build();
     final Action fileSaveAsAction = new ActionBuilder()
         .setText( "Main.menu.file.save_as" )
         .setAction( e -> fileSaveAs() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action fileSaveAllAction = new ActionBuilder()
         .setText( "Main.menu.file.save_all" )
         .setAccelerator( "Shortcut+Shift+S" )
         .setAction( e -> fileSaveAll() )
         .setDisable( Bindings.not(
             getFileEditorPane().anyFileEditorModifiedProperty() ) )
         .build();
     final Action fileExitAction = new ActionBuilder()
         .setText( "Main.menu.file.exit" )
         .setAction( e -> fileExit() )
         .build();
     // Edit actions
     final Action editUndoAction = new ActionBuilder()
         .setText( "Main.menu.edit.undo" )
         .setAccelerator( "Shortcut+Z" )
         .setIcon( UNDO )
         .setAction( e -> getActiveEditor().undo() )
         .setDisable( createActiveBooleanProperty(
             FileEditorTab::canUndoProperty ).not() )
         .build();
     final Action editRedoAction = new ActionBuilder()
         .setText( "Main.menu.edit.redo" )
         .setAccelerator( "Shortcut+Y" )
         .setIcon( REPEAT )
         .setAction( e -> getActiveEditor().redo() )
         .setDisable( createActiveBooleanProperty(
             FileEditorTab::canRedoProperty ).not() )
         .build();
     final Action editFindAction = new ActionBuilder()
         .setText( "Main.menu.edit.find" )
         .setAccelerator( "Ctrl+F" )
         .setIcon( SEARCH )
         .setAction( e -> editFind() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action editFindNextAction = new ActionBuilder()
         .setText( "Main.menu.edit.find.next" )
         .setAccelerator( "F3" )
         .setIcon( null )
         .setAction( e -> editFindNext() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action editPreferencesAction = new ActionBuilder()
         .setText( "Main.menu.edit.preferences" )
         .setAccelerator( "Ctrl+Alt+S" )
         .setAction( e -> editPreferences() )
         .build();
     // Insert actions
     final Action insertBoldAction = new ActionBuilder()
         .setText( "Main.menu.insert.bold" )
         .setAccelerator( "Shortcut+B" )
         .setIcon( BOLD )
         .setAction( e -> insertMarkdown( "**", "**" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertItalicAction = new ActionBuilder()
         .setText( "Main.menu.insert.italic" )
         .setAccelerator( "Shortcut+I" )
         .setIcon( ITALIC )
         .setAction( e -> insertMarkdown( "*", "*" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertSuperscriptAction = new ActionBuilder()
         .setText( "Main.menu.insert.superscript" )
         .setAccelerator( "Shortcut+[" )
         .setIcon( SUPERSCRIPT )
         .setAction( e -> insertMarkdown( "^", "^" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertSubscriptAction = new ActionBuilder()
         .setText( "Main.menu.insert.subscript" )
         .setAccelerator( "Shortcut+]" )
         .setIcon( SUBSCRIPT )
         .setAction( e -> insertMarkdown( "~", "~" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertStrikethroughAction = new ActionBuilder()
         .setText( "Main.menu.insert.strikethrough" )
         .setAccelerator( "Shortcut+T" )
         .setIcon( STRIKETHROUGH )
         .setAction( e -> insertMarkdown( "~~", "~~" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertBlockquoteAction = new ActionBuilder()
         .setText( "Main.menu.insert.blockquote" )
         .setAccelerator( "Ctrl+Q" )
         .setIcon( QUOTE_LEFT )
         .setAction( e -> insertMarkdown( "\n\n> ", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertCodeAction = new ActionBuilder()
         .setText( "Main.menu.insert.code" )
         .setAccelerator( "Shortcut+K" )
         .setIcon( CODE )
         .setAction( e -> insertMarkdown( "`", "`" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertFencedCodeBlockAction = new ActionBuilder()
         .setText( "Main.menu.insert.fenced_code_block" )
         .setAccelerator( "Shortcut+Shift+K" )
         .setIcon( FILE_CODE_ALT )
         .setAction( e -> getActiveEditor().surroundSelection(
             "\n\n```\n",
             "\n```\n\n",
             get( "Main.menu.insert.fenced_code_block.prompt" ) ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertLinkAction = new ActionBuilder()
         .setText( "Main.menu.insert.link" )
         .setAccelerator( "Shortcut+L" )
         .setIcon( LINK )
         .setAction( e -> getActiveEditor().insertLink() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertImageAction = new ActionBuilder()
         .setText( "Main.menu.insert.image" )
         .setAccelerator( "Shortcut+G" )
         .setIcon( PICTURE_ALT )
         .setAction( e -> getActiveEditor().insertImage() )
         .setDisable( activeFileEditorIsNull )
         .build();
     // Number of header actions (H1 ... H3)
     final int HEADERS = 3;
     final Action[] headers = new Action[ HEADERS ];
     for( int i = 1; i <= HEADERS; i++ ) {
       final String hashes = new String( new char[ i ] ).replace( "\0", "#" );
       final String markup = String.format( "%n%n%s ", hashes );
       final String text = "Main.menu.insert.header." + i;
       final String accelerator = "Shortcut+" + i;
       final String prompt = text + ".prompt";
       headers[ i - 1 ] = new ActionBuilder()
           .setText( text )
           .setAccelerator( accelerator )
           .setIcon( HEADER )
           .setAction( e -> insertMarkdown( markup, "", get( prompt ) ) )
           .setDisable( activeFileEditorIsNull )
           .build();
+    }
     final Action insertUnorderedListAction = new ActionBuilder()
         .setText( "Main.menu.insert.unordered_list" )
         .setAccelerator( "Shortcut+U" )
         .setIcon( LIST_UL )
         .setAction( e -> getActiveEditor()
             .surroundSelection( "\n\n* ", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertOrderedListAction = new ActionBuilder()
         .setText( "Main.menu.insert.ordered_list" )
         .setAccelerator( "Shortcut+Shift+O" )
         .setIcon( LIST_OL )
         .setAction( e -> insertMarkdown(
             "\n\n1. ", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertHorizontalRuleAction = new ActionBuilder()
         .setText( "Main.menu.insert.horizontal_rule" )
         .setAccelerator( "Shortcut+H" )
         .setAction( e -> insertMarkdown(
             "\n\n---\n\n", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     // Help actions
     final Action helpAboutAction = new ActionBuilder()
         .setText( "Main.menu.help.about" )
         .setAction( e -> helpAbout() )
         .build();
     //---- MenuBar ----
     final Menu fileMenu = ActionUtils.createMenu(
         get( "Main.menu.file" ),
         fileNewAction,
         fileOpenAction,
         null,
         fileCloseAction,
         fileCloseAllAction,
         null,
         fileSaveAction,
         fileSaveAsAction,
         fileSaveAllAction,
         null,
         fileExitAction );
     final Menu editMenu = ActionUtils.createMenu(
         get( "Main.menu.edit" ),
         editUndoAction,
         editRedoAction,
         editFindAction,
         editFindNextAction,
         null,
         editPreferencesAction );
     final Menu insertMenu = ActionUtils.createMenu(
         get( "Main.menu.insert" ),
         insertBoldAction,
         insertItalicAction,
         insertSuperscriptAction,
         insertSubscriptAction,
         insertStrikethroughAction,
         insertBlockquoteAction,
         insertCodeAction,
         insertFencedCodeBlockAction,
         null,
         insertLinkAction,
         insertImageAction,
         null,
         headers[ 0 ],
         headers[ 1 ],
         headers[ 2 ],
         null,
         insertUnorderedListAction,
         insertOrderedListAction,
         insertHorizontalRuleAction );
     final Menu helpMenu = ActionUtils.createMenu(
         get( "Main.menu.help" ),
         helpAboutAction );
     final MenuBar menuBar = new MenuBar(
         fileMenu,
         editMenu,
         insertMenu,
         helpMenu );
     //---- ToolBar ----
     final ToolBar toolBar = ActionUtils.createToolBar(
         fileNewAction,
         fileOpenAction,
         fileSaveAction,
         null,
         editUndoAction,
         editRedoAction,
         null,
         insertBoldAction,
         insertItalicAction,
         insertSuperscriptAction,
         insertSubscriptAction,
         insertBlockquoteAction,
         insertCodeAction,
         insertFencedCodeBlockAction,
         null,
         insertLinkAction,
         insertImageAction,
         null,
         headers[ 0 ],
         null,
         insertUnorderedListAction,
         insertOrderedListAction );
     return new VBox( menuBar, toolBar );
+  }
   private UserPreferences createUserPreferences() {
     return new UserPreferences();
+  }
   /**
    * Creates a boolean property that is bound to another boolean value of the
    * active editor.
    */
   private BooleanProperty createActiveBooleanProperty(
       final Function<FileEditorTab, ObservableBooleanValue> func ) {
     final BooleanProperty b = new SimpleBooleanProperty();
     final FileEditorTab tab = getActiveFileEditor();
     if( tab != null ) {
       b.bind( func.apply( tab ) );
+    }
     getFileEditorPane().activeFileEditorProperty().addListener(
         ( observable, oldFileEditor, newFileEditor ) -> {
           b.unbind();
           if( newFileEditor == null ) {
             b.set( false );
+          }
           else {
             b.bind( func.apply( newFileEditor ) );
+          }
+        }
     );
     return b;
+  }
   //---- Convenience accessors ----------------------------------------------
   private Preferences getPreferences() {
     return OPTIONS.getState();
+  }
   private float getFloat( final String key, final float defaultValue ) {
     return getPreferences().getFloat( key, defaultValue );
+  }
   public Window getWindow() {
     return getScene().getWindow();
+  }
   private MarkdownEditorPane getActiveEditor() {
     final EditorPane pane = getActiveFileEditor().getEditorPane();
     return pane instanceof MarkdownEditorPane
         ? (MarkdownEditorPane) pane
         : new MarkdownEditorPane();
+  }
   private FileEditorTab getActiveFileEditor() {
     return getFileEditorPane().getActiveFileEditor();
+  }
   //---- Member accessors ---------------------------------------------------
   protected Scene getScene() {
     return mScene;
+  }
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     return mProcessors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     return mPreviewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     assert definitionSource != null;
     mDefinitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     return mDefinitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     return mDefinitionPane;
+  }
   private Notifier getNotifier() {
     return NOTIFIER;
+  }
   private Text getLineNumberText() {
     return mLineNumberText;
+  }
   private StatusBar getStatusBar() {
     return mStatusBar;
+  }
   private TextField getFindTextField() {
     return mFindTextField;
+  }
   /**
    * Returns the variable map of interpolated definitions.
+   *
    * @return A map to help dereference variables.
    */
   private Map<String, String> getResolvedMap() {
     return mResolvedMap;
+  }
   //---- Persistence accessors ----------------------------------------------
   private UserPreferences getUserPreferences() {
     return OPTIONS.getUserPreferences();
+  }
   private Path getDefinitionPath() {
     return getUserPreferences().getDefinitionPath();
+  }
   private File getImagesDirectory() {
     return getUserPreferences().getImagesDirectory();
+  }
   private String getImagesOrder() {
     return getUserPreferences().getImagesOrder();
+  }
+}

A src/main/java/com/scrivenvar/Messages.java

 /*
  * Copyright (c) 2016 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  * Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  * Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.Stack;
 import static com.scrivenvar.Constants.APP_BUNDLE_NAME;
 import static java.util.ResourceBundle.getBundle;
 /**
  * Recursively resolves message properties. Property values can refer to other
  * properties using a <code>${var}</code> syntax.
+ *
  * @author Karl Tauber, Dave Jarvis
  */
 public class Messages {
   private static final ResourceBundle RESOURCE_BUNDLE =
       getBundle( APP_BUNDLE_NAME );
   private Messages() {
+  }
   /**
    * Return the value of a resource bundle value after having resolved any
    * references to other bundle variables.
+   *
    * @param props The bundle containing resolvable properties.
    * @param s     The value for a key to resolve.
    * @return The value of the key with all references recursively dereferenced.
    */
   @SuppressWarnings("SameParameterValue")
   private static String resolve( final ResourceBundle props, final String s ) {
     final int len = s.length();
     final Stack<StringBuilder> stack = new Stack<>();
     StringBuilder sb = new StringBuilder( 256 );
     boolean open = false;
     for( int i = 0; i < len; i++ ) {
       final char c = s.charAt( i );
       switch( c ) {
         case '$': {
           if( i + 1 < len && s.charAt( i + 1 ) == '{' ) {
             stack.push( sb );
             sb = new StringBuilder( 256 );
             i++;
             open = true;
+          }
           break;
+        }
         case '}': {
           if( open ) {
             open = false;
             final String name = sb.toString();
             sb = stack.pop();
             sb.append( props.getString( name ) );
             break;
+          }
+        }
         default: {
           sb.append( c );
           break;
+        }
+      }
+    }
     if( open ) {
       throw new IllegalArgumentException( "missing '}'" );
+    }
     return sb.toString();
+  }
   /**
    * Returns the value for a key from the message bundle.
+   *
    * @param key Retrieve the value for this key.
    * @return The value for the key.
    */
   public static String get( final String key ) {
     try {
       return resolve( RESOURCE_BUNDLE, RESOURCE_BUNDLE.getString( key ) );
     } catch( final Exception ex ) {
       return key;
+    }
+  }
   public static String getLiteral( final String key ) {
     return RESOURCE_BUNDLE.getString( key );
+  }
   public static String get( final String key, final boolean interpolate ) {
     return interpolate ? get( key ) : getLiteral( key );
+  }
   /**
    * Returns the value for a key from the message bundle with the arguments
    * replacing <code>{#}</code> place holders.
+   *
    * @param key  Retrieve the value for this key.
    * @param args The values to substitute for place holders.
    * @return The value for the key.
    */
   public static String get( final String key, final Object... args ) {
     return MessageFormat.format( get( key ), args );
+  }
+}

A src/main/java/com/scrivenvar/Services.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
 /**
  * Responsible for loading services. The services are treated as singleton
  * instances.
+ *
  * @author White Magic Software, Ltd.
  */
 public class Services {
   @SuppressWarnings("rawtypes")
   private static final Map<Class, Object> SINGLETONS = new HashMap<>();
   /**
    * Loads a service based on its interface definition. This will return an
    * existing instance if the class has already been instantiated.
+   *
    * @param <T> The service to load.
    * @param api The interface definition for the service.
    * @return A class that implements the interface.
    */
   @SuppressWarnings("unchecked")
   public static <T> T load( final Class<T> api ) {
     final T o = (T) get( api );
     return o == null ? newInstance( api ) : o;
+  }
   private static <T> T newInstance( final Class<T> api ) {
     final ServiceLoader<T> services = ServiceLoader.load( api );
     for( final T service : services ) {
       if( service != null ) {
         // Re-use the same instance the next time the class is loaded.
         put( api, service );
         return service;
+      }
+    }
     throw new RuntimeException( "No implementation for: " + api );
+  }
   @SuppressWarnings("rawtypes")
   private static void put( final Class key, Object value ) {
     SINGLETONS.put( key, value );
+  }
   @SuppressWarnings("rawtypes")
   private static Object get( final Class api ) {
     return SINGLETONS.get( api );
+  }
+}

A src/main/java/com/scrivenvar/controls/BrowseDirectoryButton.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import com.scrivenvar.Messages;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Tooltip;
 import javafx.stage.DirectoryChooser;
 import java.io.File;
 /**
  * Button that opens a directory chooser to select a local directory for a
  * URL in markdown.
+ *
  * @author Karl Tauber
  */
 public class BrowseDirectoryButton
     extends BrowseFileButton {
   public BrowseDirectoryButton() {
     setGraphic( FontAwesomeIconFactory.get()
                                       .createIcon( FontAwesomeIcon.FOLDER_ALT,
                                                    "1.2em" ) );
     setTooltip( new Tooltip( Messages.get( "BrowseDirectoryButton.tooltip" ) ) );
+  }
   @Override
   protected void browse( ActionEvent e ) {
     DirectoryChooser directoryChooser = new DirectoryChooser();
     directoryChooser.setTitle( Messages.get(
         "BrowseDirectoryButton.chooser.title" ) );
     directoryChooser.setInitialDirectory( getInitialDirectory() );
     File result = directoryChooser.showDialog( getScene().getWindow() );
     if( result != null ) {
       updateUrl( result );
+    }
+  }
+}

A src/main/java/com/scrivenvar/controls/BrowseFileButton.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import com.scrivenvar.Messages;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
 /**
  * Button that opens a file chooser to select a local file for a URL in markdown.
+ *
  * @author Karl Tauber
  */
 public class BrowseFileButton
 	extends Button
+{
 	private final List<ExtensionFilter> extensionFilters = new ArrayList<>();
 	public BrowseFileButton() {
 		setGraphic(FontAwesomeIconFactory.get().createIcon(FontAwesomeIcon.FILE_ALT, "1.2em"));
 		setTooltip(new Tooltip(Messages.get("BrowseFileButton.tooltip")));
 		setOnAction(this::browse);
 		disableProperty().bind(basePath.isNull());
 		// workaround for a JavaFX bug:
 		//   avoid closing the dialog that contains this control when the user
 		//   closes the FileChooser or DirectoryChooser using the ESC key
 		addEventHandler(KeyEvent.KEY_RELEASED, e-> {
 			if (e.getCode() == KeyCode.ESCAPE)
 				e.consume();
 		});
+	}
 	public void addExtensionFilter(ExtensionFilter extensionFilter) {
 		extensionFilters.add(extensionFilter);
+	}
 	// 'basePath' property
 	private final ObjectProperty<Path> basePath = new SimpleObjectProperty<>();
 	public Path getBasePath() { return basePath.get(); }
 	public void setBasePath(Path basePath) { this.basePath.set(basePath); }
 	public ObjectProperty<Path> basePathProperty() { return basePath; }
 	// 'url' property
 	private final ObjectProperty<String> url = new SimpleObjectProperty<>();
 	public String getUrl() { return url.get(); }
 	public void setUrl(String url) { this.url.set(url); }
 	public ObjectProperty<String> urlProperty() { return url; }
 	protected void browse(ActionEvent e) {
 		FileChooser fileChooser = new FileChooser();
 		fileChooser.setTitle(Messages.get("BrowseFileButton.chooser.title"));
 		fileChooser.getExtensionFilters().addAll(extensionFilters);
 		fileChooser.getExtensionFilters().add(new ExtensionFilter(Messages.get("BrowseFileButton.chooser.allFilesFilter"), "*.*"));
 		fileChooser.setInitialDirectory(getInitialDirectory());
 		File result = fileChooser.showOpenDialog(getScene().getWindow());
 		if (result != null)
 			updateUrl(result);
+	}
 	protected File getInitialDirectory() {
 		//TODO build initial directory based on current value of 'url' property
 		return getBasePath().toFile();
+	}
 	protected void updateUrl(File file) {
 		String newUrl;
 		try {
 			newUrl = getBasePath().relativize(file.toPath()).toString();
 		} catch (IllegalArgumentException ex) {
 			newUrl = file.toString();
+		}
 		url.set(newUrl.replace('\\', '/'));
+	}
+}

A src/main/java/com/scrivenvar/controls/EscapeTextField.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.TextField;
 import javafx.util.StringConverter;
 /**
  * TextField that can escape/unescape characters for markdown.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class EscapeTextField extends TextField {
   public EscapeTextField() {
     escapedText.bindBidirectional(
         textProperty(),
         new StringConverter<>() {
           @Override
           public String toString( String object ) {
             return escape( object );
+          }
           @Override
           public String fromString( String string ) {
             return unescape( string );
+          }
+        }
     );
     escapeCharacters.addListener(
         e -> escapedText.set( escape( textProperty().get() ) )
     );
+  }
   // 'escapedText' property
   private final StringProperty escapedText = new SimpleStringProperty();
   public StringProperty escapedTextProperty() {
     return escapedText;
+  }
   // 'escapeCharacters' property
   private final StringProperty escapeCharacters = new SimpleStringProperty();
   public String getEscapeCharacters() {
     return escapeCharacters.get();
+  }
   public void setEscapeCharacters( String escapeCharacters ) {
     this.escapeCharacters.set( escapeCharacters );
+  }
   private String escape( final String s ) {
     final String escapeChars = getEscapeCharacters();
     return isEmpty( escapeChars ) ? s :
         s.replaceAll( "([" + escapeChars.replaceAll(
             "(.)",
             "\\\\$1" ) + "])", "\\\\$1" );
+  }
   private String unescape( final String s ) {
     final String escapeChars = getEscapeCharacters();
     return isEmpty( escapeChars ) ? s :
         s.replaceAll( "\\\\([" + escapeChars
             .replaceAll( "(.)", "\\\\$1" ) + "])", "$1" );
+  }
   private static boolean isEmpty( final String s ) {
     return s == null || s.isEmpty();
+  }
+}

A src/main/java/com/scrivenvar/controls/FlagCheckBox.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.scene.control.CheckBox;
 /**
  * CheckBox that toggles a bit in an integer.
+ *
  * @author Karl Tauber
  */
 public class FlagCheckBox extends CheckBox {
   public FlagCheckBox() {
     setOnAction( e -> {
       if( isSelected() ) {
         setFlags( getFlags() | getFlag() );
       } else {
         setFlags( getFlags() & ~getFlag() );
+      }
     } );
     flags.addListener( (obs, oldFlags, newFlags) -> {
       setSelected( (newFlags.intValue() & getFlag()) != 0 );
     } );
+  }
   // 'flag' property
   private final IntegerProperty flag = new SimpleIntegerProperty();
   public int getFlag() {
     return flag.get();
+  }
   public void setFlag( int flag ) {
     this.flag.set( flag );
+  }
   public IntegerProperty flagProperty() {
     return flag;
+  }
   // 'flags' property
   private final IntegerProperty flags = new SimpleIntegerProperty();
   public int getFlags() {
     return flags.get();
+  }
   public void setFlags( int flags ) {
     this.flags.set( flags );
+  }
   public IntegerProperty flagsProperty() {
     return flags;
+  }
+}

A src/main/java/com/scrivenvar/controls/WebHyperlink.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import com.scrivenvar.Main;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Hyperlink;
 /**
  * Opens a web site in the default web browser.
+ *
  * @author Karl Tauber
  */
 public class WebHyperlink extends Hyperlink {
   // 'uri' property
   private final StringProperty uri = new SimpleStringProperty();
   public WebHyperlink() {
     setStyle( "-fx-padding: 0; -fx-border-width: 0" );
+  }
   @Override
   public void fire() {
     Main.showDocument( getUri() );
+  }
   public String getUri() {
     return uri.get();
+  }
   public void setUri( String uri ) {
     this.uri.set( uri );
+  }
   public StringProperty uriProperty() {
     return uri;
+  }
+}

A src/main/java/com/scrivenvar/decorators/RVariableDecorator.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.decorators;
 /**
  * Brackets variable names with <code>`r#</code> and <code>`</code>.
+ *
  * @author White Magic Software, Ltd.
  */
 public class RVariableDecorator implements VariableDecorator {
   public static final String PREFIX = "`r#";
   public static final char SUFFIX = '`';
   /**
    * Returns the given string R-escaping backticks prepended and appended. This
    * is not null safe. Do not pass null into this method.
+   *
    * @param variableName The string to decorate.
    * @return "`r#" + variableName + "`".
    */
   @Override
   public String decorate( String variableName ) {
     assert variableName != null;
     // Delete the $ $ sigils from Markdown variables.
     if( variableName.length() > 1 ) {
       variableName = variableName.substring( 1, variableName.length() - 1 );
+    }
     return PREFIX +
         "x( v$" +
         variableName.replace( '.', '$' ) +
         " )" +
         SUFFIX;
+  }
+}

A src/main/java/com/scrivenvar/decorators/VariableDecorator.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.decorators;
 /**
  * Responsible for updating variable names to use a machine-readable format
  * corresponding to the type of file being edited.
  */
 public interface VariableDecorator {
   /**
    * This decorates a variable name based on some criteria determined by the
    * factory that creates implementations of this interface.
+   *
    * @param variableName The text to decorate as per the filename extension
    *                     would indicate (e.g., ".md" goes to $VAR$ while "
    *                     .Rmd" goes to `r#VAR`).
    * @return The given variable name modified with its requisite delimiters.
    */
   String decorate( String variableName );
+}

A src/main/java/com/scrivenvar/decorators/YamlVariableDecorator.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.decorators;
 /**
  * Brackets variable names with dollar symbols.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlVariableDecorator implements VariableDecorator {
   /**
    * Returns the given {@link String} verbatim because variables in YAML
    * documents and plain Markdown documents already have the appropriate
    * tokenizable syntax wrapped around the text.
+   *
    * @param variableName Returned verbatim.
    */
   @Override
   public String decorate( final String variableName ) {
     assert variableName != null;
     return variableName;
+  }
   /**
    * Sigilifies the given key.
+   *
    * @param key The key to adorn with YAML variable sigil characters.
    * @return The given key bracketed by dollar symbols.
    */
   public static String entoken( final String key ) {
     assert key != null;
     return '$' + key + '$';
+  }
+}

A src/main/java/com/scrivenvar/definition/DefinitionFactory.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import com.scrivenvar.AbstractFileFactory;
 import com.scrivenvar.FileType;
 import com.scrivenvar.definition.yaml.YamlDefinitionSource;
 import com.scrivenvar.util.ProtocolResolver;
 import java.nio.file.Path;
 import static com.scrivenvar.Constants.DEFINITION_PROTOCOL_FILE;
 import static com.scrivenvar.Constants.GLOB_PREFIX_DEFINITION;
 import static com.scrivenvar.FileType.YAML;
 /**
  * Responsible for creating objects that can read and write definition data
  * sources. The data source could be YAML, TOML, JSON, flat files, or from a
  * database.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefinitionFactory extends AbstractFileFactory {
   /**
    * Default (empty) constructor.
    */
   public DefinitionFactory() {
+  }
   /**
    * Creates a definition source capable of reading definitions from the given
    * path.
+   *
    * @param path Path to a resource containing definitions.
    * @return The definition source appropriate for the given path.
    */
   public DefinitionSource createDefinitionSource( final Path path ) {
     assert path != null;
     final String protocol = ProtocolResolver.getProtocol( path.toString() );
     DefinitionSource result = null;
     if( DEFINITION_PROTOCOL_FILE.equals( protocol ) ) {
       final FileType filetype = lookup( path, GLOB_PREFIX_DEFINITION );
       result = createFileDefinitionSource( filetype, path );
+    }
     else {
       unknownFileType( protocol, path.toString() );
+    }
     return result;
+  }
   /**
    * Creates a definition source based on the file type.
+   *
    * @param filetype Property key name suffix from settings.properties file.
    * @param path     Path to the file that corresponds to the extension.
    * @return A DefinitionSource capable of parsing the data stored at the path.
    */
   private DefinitionSource createFileDefinitionSource(
       final FileType filetype, final Path path ) {
     assert filetype != null;
     assert path != null;
     if( filetype == YAML ) {
       return new YamlDefinitionSource( path );
+    }
     throw new IllegalArgumentException( filetype.toString() );
+  }
+}

A src/main/java/com/scrivenvar/definition/DefinitionPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.TextFieldTreeCell;
 import javafx.scene.input.KeyEvent;
 import javafx.util.StringConverter;
 import java.util.*;
 import static com.scrivenvar.Messages.get;
 import static javafx.scene.input.KeyEvent.KEY_PRESSED;
 /**
  * Provides the user interface that holds a {@link TreeView}, which
  * allows users to interact with key/value pairs loaded from the
  * {@link DocumentParser} and adapted using a {@link TreeAdapter}.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class DefinitionPane extends TitledPane {
   /**
    * Trimmed off the end of a word to match a variable name.
    */
   private final static String TERMINALS = ":;,.!?-/\\¡¿";
   /**
    * Contains a view of the definitions.
    */
   private final TreeView<String> mTreeView = new TreeView<>();
   /**
    * Handlers for key press events.
    */
   private final Set<EventHandler<? super KeyEvent>> mKeyEventHandlers
       = new HashSet<>();
   /**
    * Definition file name shown in the title of the pane.
    */
   private final StringProperty mFilename = new SimpleStringProperty();
   /**
    * Constructs a definition pane with a given tree view root.
    */
   public DefinitionPane() {
     final var treeView = getTreeView();
     treeView.setEditable( true );
     treeView.setCellFactory( cell -> createTreeCell() );
     treeView.setContextMenu( createContextMenu() );
     treeView.addEventFilter( KEY_PRESSED, this::keyEventFilter );
     treeView.setShowRoot( false );
     getSelectionModel().setSelectionMode( SelectionMode.MULTIPLE );
     textProperty().bind( mFilename );
     setContent( treeView );
     setCollapsible( false );
+  }
   /**
    * Changes the root of the {@link TreeView} to the root of the
    * {@link TreeView} from the {@link DefinitionSource}.
+   *
    * @param definitionSource Container for the hierarchy of key/value pairs
    *                         to replace the existing hierarchy.
    */
   public void update( final DefinitionSource definitionSource ) {
     assert definitionSource != null;
     final TreeAdapter treeAdapter = definitionSource.getTreeAdapter();
     final TreeItem<String> root = treeAdapter.adapt(
         get( "Pane.definition.node.root.title" )
     );
     getTreeView().setRoot( root );
+  }
   public Map<String, String> toMap() {
     return TreeItemAdapter.toMap( getTreeView().getRoot() );
+  }
   /**
    * Informs the caller of whenever any {@link TreeItem} in the {@link TreeView}
    * is modified. The modifications include: item value changes, item additions,
    * and item removals.
    * <p>
    * Safe to call multiple times; if a handler is already registered, the
    * old handler is used.
    * </p>
+   *
    * @param handler The handler to call whenever any {@link TreeItem} changes.
    */
   public void addTreeChangeHandler(
       final EventHandler<TreeItem.TreeModificationEvent<Event>> handler ) {
     final TreeItem<String> root = getTreeView().getRoot();
     root.addEventHandler( TreeItem.valueChangedEvent(), handler );
     root.addEventHandler( TreeItem.childrenModificationEvent(), handler );
+  }
   public void addKeyEventHandler(
       final EventHandler<? super KeyEvent> handler ) {
     getKeyEventHandlers().add( handler );
+  }
   /**
    * Answers whether the {@link TreeItem}s in the {@link TreeView} are suitably
    * well-formed for export. A tree is considered well-formed if the following
    * conditions are met:
+   *
    * <ul>
    *   <li>The root node contains at least one child node having a leaf.</li>
    *   <li>There are no leaf nodes with sibling leaf nodes.</li>
    * </ul>
+   *
    * @return {@code null} if the document is well-formed, otherwise the
    * problematic child {@link TreeItem}.
    */
   public TreeItem<String> isTreeWellFormed() {
     final var root = getTreeView().getRoot();
     for( final var child : root.getChildren() ) {
       final var problemChild = isWellFormed( child );
       if( child.isLeaf() || problemChild != null ) {
         return problemChild;
+      }
+    }
     return null;
+  }
   /**
    * Determines whether the document is well-formed by ensuring that
    * child branches do not contain multiple leaves.
+   *
    * @param item The sub-tree to check for well-formedness.
    * @return {@code null} when the tree is well-formed, otherwise the
    * problematic {@link TreeItem}.
    */
   private TreeItem<String> isWellFormed( final TreeItem<String> item ) {
     int childLeafs = 0;
     int childBranches = 0;
     for( final TreeItem<String> child : item.getChildren() ) {
       if( child.isLeaf() ) {
         childLeafs++;
+      }
       else {
         childBranches++;
+      }
       final var problemChild = isWellFormed( child );
       if( problemChild != null ) {
         return problemChild;
+      }
+    }
     return ((childBranches > 0 && childLeafs == 0) ||
         (childBranches == 0 && childLeafs <= 1)) ? null : item;
+  }
   /**
    * Returns the leaf that matches the given value. If the value is terminally
    * punctuated, the punctuation is removed if no match was found.
+   *
    * @param value    The value to find, never null.
    * @param findMode Defines how to match words.
    * @return The leaf that contains the given value, or null if neither the
    * original value nor the terminally-trimmed value was found.
    */
   public VariableTreeItem<String> findLeaf(
       final String value, final FindMode findMode ) {
     final VariableTreeItem<String> root = getTreeRoot();
     final VariableTreeItem<String> leaf = root.findLeaf( value, findMode );
     return leaf == null
         ? root.findLeaf( rtrimTerminalPunctuation( value ) )
         : leaf;
+  }
   /**
    * Removes punctuation from the end of a string.
+   *
    * @param s The string to trim, never null.
    * @return The string trimmed of all terminal characters from the end
    */
   private String rtrimTerminalPunctuation( final String s ) {
     assert s != null;
     int index = s.length() - 1;
     while( index > 0 && (TERMINALS.indexOf( s.charAt( index ) ) >= 0) ) {
       index--;
+    }
     return s.substring( 0, index );
+  }
   /**
    * Expands the node to the root, recursively.
+   *
    * @param <T>  The type of tree item to expand (usually String).
    * @param node The node to expand.
    */
   public <T> void expand( final TreeItem<T> node ) {
     if( node != null ) {
       expand( node.getParent() );
       if( !node.isLeaf() ) {
         node.setExpanded( true );
+      }
+    }
+  }
   public void select( final TreeItem<String> item ) {
     getSelectionModel().clearSelection();
     getSelectionModel().select( getTreeView().getRow( item ) );
+  }
   /**
    * Collapses the tree, recursively.
    */
   public void collapse() {
     collapse( getTreeRoot().getChildren() );
+  }
   /**
    * Collapses the tree, recursively.
+   *
    * @param <T>   The type of tree item to expand (usually String).
    * @param nodes The nodes to collapse.
    */
   private <T> void collapse( final ObservableList<TreeItem<T>> nodes ) {
     for( final TreeItem<T> node : nodes ) {
       node.setExpanded( false );
       collapse( node.getChildren() );
+    }
+  }
   /**
    * @return {@code true} when the user is editing a {@link TreeItem}.
    */
   private boolean isEditingTreeItem() {
     return getTreeView().editingItemProperty().getValue() != null;
+  }
   /**
    * Changes to edit mode for the selected item.
    */
   private void editSelectedItem() {
     getTreeView().edit( getSelectedItem() );
+  }
   /**
    * Removes all selected items from the {@link TreeView}.
    */
   private void deleteSelectedItems() {
     for( final TreeItem<String> item : getSelectedItems() ) {
       final TreeItem<String> parent = item.getParent();
       if( parent != null ) {
         parent.getChildren().remove( item );
+      }
+    }
+  }
   /**
    * Deletes the selected item.
    */
   private void deleteSelectedItem() {
     final TreeItem<String> c = getSelectedItem();
     getSiblings( c ).remove( c );
+  }
   /**
    * Adds a new item under the selected item (or root if nothing is selected).
    * There are a few conditions to consider: when adding to the root,
    * when adding to a leaf, and when adding to a non-leaf. Items added to the
    * root must contain two items: a key and a value.
    */
   private void addItem() {
     final TreeItem<String> value = createTreeItem();
     getSelectedItem().getChildren().add( value );
     expand( value );
     select( value );
+  }
   private ContextMenu createContextMenu() {
     final ContextMenu menu = new ContextMenu();
     final ObservableList<MenuItem> items = menu.getItems();
     addMenuItem( items, "Definition.menu.create" )
         .setOnAction( e -> addItem() );
     addMenuItem( items, "Definition.menu.rename" )
         .setOnAction( e -> editSelectedItem() );
     addMenuItem( items, "Definition.menu.remove" )
         .setOnAction( e -> deleteSelectedItem() );
     return menu;
+  }
   /**
    * Executes hot-keys for edits to the definition tree.
+   *
    * @param event Contains the key code of the key that was pressed.
    */
   private void keyEventFilter( final KeyEvent event ) {
     if( !isEditingTreeItem() ) {
       switch( event.getCode() ) {
         case ENTER:
           expand( getSelectedItem() );
           event.consume();
           break;
         case DELETE:
           deleteSelectedItems();
           break;
         case INSERT:
           addItem();
           break;
         case R:
           if( event.isControlDown() ) {
             editSelectedItem();
+          }
           break;
+      }
       for( final var handler : getKeyEventHandlers() ) {
         handler.handle( event );
+      }
+    }
+  }
   /**
    * Adds a menu item to a list of menu items.
+   *
    * @param items    The list of menu items to append to.
    * @param labelKey The resource bundle key name for the menu item's label.
    * @return The menu item added to the list of menu items.
    */
   private MenuItem addMenuItem(
       final List<MenuItem> items, final String labelKey ) {
     final MenuItem menuItem = createMenuItem( labelKey );
     items.add( menuItem );
     return menuItem;
+  }
   private MenuItem createMenuItem( final String labelKey ) {
     return new MenuItem( get( labelKey ) );
+  }
   private VariableTreeItem<String> createTreeItem() {
     return new VariableTreeItem<>( get( "Definition.menu.add.default" ) );
+  }
   private TreeCell<String> createTreeCell() {
     return new TextFieldTreeCell<>(
         createStringConverter() ) {
       @Override
       public void commitEdit( final String newValue ) {
         super.commitEdit( newValue );
         select( getTreeItem() );
         requestFocus();
+      }
     };
+  }
   @Override
   public void requestFocus() {
     super.requestFocus();
     getTreeView().requestFocus();
+  }
   private StringConverter<String> createStringConverter() {
     return new StringConverter<>() {
       @Override
       public String toString( final String object ) {
         return object == null ? "" : object;
+      }
       @Override
       public String fromString( final String string ) {
         return string == null ? "" : string;
+      }
     };
+  }
   /**
    * Returns the tree view that contains the definition hierarchy.
+   *
    * @return A non-null instance.
    */
   public TreeView<String> getTreeView() {
     return mTreeView;
+  }
   /**
    * Returns this pane.
+   *
    * @return this
    */
   public Node getNode() {
     return this;
+  }
   /**
    * Returns the property used to set the title of the pane: the file name.
+   *
    * @return A non-null property used for showing the definition file name.
    */
   public StringProperty filenameProperty() {
     return mFilename;
+  }
   /**
    * Returns the root of the tree.
+   *
    * @return The first node added to the definition tree.
    */
   private VariableTreeItem<String> getTreeRoot() {
     final TreeItem<String> root = getTreeView().getRoot();
     return root instanceof VariableTreeItem ?
         (VariableTreeItem<String>) root : new VariableTreeItem<>( "root" );
+  }
   private ObservableList<TreeItem<String>> getSiblings(
       final TreeItem<String> item ) {
     final TreeItem<String> root = getTreeView().getRoot();
     final TreeItem<String> parent =
         (item == null || item == root) ? root : item.getParent();
     return parent.getChildren();
+  }
   private MultipleSelectionModel<TreeItem<String>> getSelectionModel() {
     return getTreeView().getSelectionModel();
+  }
   /**
    * Returns a copy of all the selected items.
+   *
    * @return A list, possibly empty, containing all selected items in the
    * {@link TreeView}.
    */
   private List<TreeItem<String>> getSelectedItems() {
     return new ArrayList<>( getSelectionModel().getSelectedItems() );
+  }
   public TreeItem<String> getSelectedItem() {
     final TreeItem<String> item = getSelectionModel().getSelectedItem();
     return item == null ? getTreeView().getRoot() : item;
+  }
   private Set<EventHandler<? super KeyEvent>> getKeyEventHandlers() {
     return mKeyEventHandlers;
+  }
+}

A src/main/java/com/scrivenvar/definition/DefinitionSource.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 /**
  * Represents behaviours for reading and writing string definitions. This
  * class cannot have any direct hooks into the user interface, as it defines
  * entry points into the definition data model loaded into an object
  * hierarchy. That hierarchy is converted to a UI model using an adapter
  * pattern.
  */
 public interface DefinitionSource {
   /**
    * Creates an object capable of producing view-based objects from this
    * definition source.
+   *
    * @return A hierarchical tree suitable for displaying in the definition pane.
    */
   TreeAdapter getTreeAdapter();
   /**
    * Returns the error message, if any, that occurred while loading the
    * definition source.
+   *
    * @return The empty string if no error occurred, otherwise the error message.
    */
   default String getError() {
     return "";
+  }
+}

A src/main/java/com/scrivenvar/definition/DocumentParser.java

 package com.scrivenvar.definition;
 /**
  * Responsible for parsing structured document formats.
+ *
  * @param <T> The type of "node" for the document's object model.
  */
 public interface DocumentParser<T> {
   /**
    * Parses a document into a nested object hierarchy. The object returned
    * from this call must be the root node in the document tree.
+   *
    * @return The document's root node, which may be empty but never null.
    */
   T getDocumentRoot();
+}

A src/main/java/com/scrivenvar/definition/FindMode.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 /**
  * Used to find variable keys by matching values. The values are matched
  * according to the relationships provided in this enumeration.
  */
 public enum FindMode {
   EXACT,
   CONTAINS,
   STARTS_WITH,
   LEVENSHTEIN
+}

A src/main/java/com/scrivenvar/definition/MapInterpolator.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 /**
  * Responsible for performing string interpolation on key/value pairs stored
  * in a map. The values in the map can use a delimited syntax to refer to
  * keys in the map.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MapInterpolator {
   /**
    * Matches variables delimited by dollar symbols.
    */
   private final static String REGEX = "(\\$.*?\\$)";
   /**
    * Compiled regular expression for matching delimited references.
    */
   private final static Pattern REGEX_PATTERN = Pattern.compile( REGEX );
   private final static int GROUP_DELIMITED = 1;
   /**
    * Empty.
    */
   private MapInterpolator() {
+  }
   /**
    * Performs string interpolation on the values in the given map. This will
    * change any value in the map that contains a variable that matches
    * {@link #REGEX_PATTERN}.
+   *
    * @param map Contains values that represent references to keys.
    */
   public static void interpolate( final Map<String, String> map ) {
     map.replaceAll( ( k, v ) -> resolve( map, v ) );
+  }
   /**
    * Given a value with zero or more key references, this will resolve all
    * the values, recursively. If a key cannot be dereferenced, the value will
    * contain the key name.
+   *
    * @param map   Map to search for keys when resolving key references.
    * @param value Value containing zero or more key references
    * @return The given value with all embedded key references interpolated.
    */
   private static String resolve(
       final Map<String, String> map, String value ) {
     final Matcher matcher = REGEX_PATTERN.matcher( value );
     while( matcher.find() ) {
       final String keyName = matcher.group( GROUP_DELIMITED );
       final String keyValue = resolve(
           map, map.getOrDefault( keyName, keyName )
       );
       value = value.replace( keyName, keyValue );
+    }
     return value;
+  }
+}

A src/main/java/com/scrivenvar/definition/RootTreeItem.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 /**
  * Indicates that this is the top-most {@link TreeItem}. This class allows
  * the {@link TreeItemAdapter} to ignore the topmost definition. Such
  * contortions are necessary because {@link TreeView} requires a root item
  * that isn't part of the user's definition file.
  * <p>
  * Another approach would be to associate object pairs per {@link TreeItem},
  * but that would be a waste of memory since the only "exception" case is
  * the root {@link TreeItem}.
  * </p>
+ *
  * @param <T> The type of {@link TreeItem} to store in the {@link TreeView}.
  * @author White Magic Software, Ltd.
  */
 public class RootTreeItem<T> extends VariableTreeItem<T> {
   /**
    * Default constructor, calls the superclass, no other behaviour.
+   *
    * @param value The {@link TreeItem} node name to construct the superclass.
    * @see TreeItemAdapter#toMap(TreeItem) for details on how this
    * class is used.
    */
   public RootTreeItem( final T value ) {
     super( value );
+  }
+}

A src/main/java/com/scrivenvar/definition/TreeAdapter.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import javafx.scene.control.TreeItem;
 import java.io.IOException;
 import java.nio.file.Path;
 /**
  * Responsible for converting an object hierarchy into a {@link TreeItem}
  * hierarchy.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface TreeAdapter {
   /**
    * Adapts the document produced by the given parser into a {@link TreeItem}
    * object that can be presented to the user within a GUI.
+   *
    * @param root The default root node name.
    * @return The parsed document in a {@link TreeItem} that can be displayed
    * in a panel.
    */
   TreeItem<String> adapt( String root );
   /**
    * Exports the given root node to the given path.
+   *
    * @param root The root node to export.
    * @param path Where to persist the data.
    * @throws IOException Could not write the data to the given path.
    */
   void export( TreeItem<String> root, Path path ) throws IOException;
+}

A src/main/java/com/scrivenvar/definition/TreeItemAdapter.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.scrivenvar.decorators.YamlVariableDecorator;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Stack;
 import static com.scrivenvar.Constants.DEFAULT_MAP_SIZE;
 /**
  * Given a {@link TreeItem}, this will generate a flat map with all the
  * values in the tree recursively interpolated. The application integrates
  * definition files as follows:
  * <ol>
  *   <li>Load YAML file into {@link JsonNode} hierarchy.</li>
  *   <li>Convert JsonNode to a {@link TreeItem} hierarchy.</li>
  *   <li>Interpolate {@link TreeItem} hierarchy as a flat map.</li>
  *   <li>Substitute flat map variables into document as required.</li>
  * </ol>
+ *
  * <p>
  * This class is responsible for producing the interpolated flat map. This
  * allows dynamic edits of the {@link TreeView} to be displayed in the
  * {@link HTMLPreviewPane} without having to reload the definition file.
  * Reloading the definition file would work, but has a number of drawbacks.
  * </p>
+ *
  * @author White Magic Software, Ltd.
  */
 public class TreeItemAdapter {
   /**
    * Separates YAML variable nodes (e.g., the dots in {@code $root.node.var$}).
    */
   public static final String SEPARATOR = ".";
   /**
    * Default buffer length for keys ({@link StringBuilder} has 16 character
    * buffer) that should be large enough for most keys to avoid reallocating
    * memory to increase the {@link StringBuilder}'s buffer.
    */
   public static final int DEFAULT_KEY_LENGTH = 64;
   /**
    * In-order traversal of a {@link TreeItem} hierarchy, exposing each item
    * as a consecutive list.
    */
   private static final class TreeIterator
       implements Iterator<TreeItem<String>> {
     private final Stack<TreeItem<String>> mStack = new Stack<>();
     public TreeIterator( final TreeItem<String> root ) {
       if( root != null ) {
         mStack.push( root );
+      }
+    }
     @Override
     public boolean hasNext() {
       return !mStack.isEmpty();
+    }
     @Override
     public TreeItem<String> next() {
       final TreeItem<String> next = mStack.pop();
       next.getChildren().forEach( mStack::push );
       return next;
+    }
+  }
   private TreeItemAdapter() {
+  }
   /**
    * Iterate over a given root node (at any level of the tree) and process each
    * leaf node into a flat map. Values must be interpolated separately.
    */
   public static Map<String, String> toMap( final TreeItem<String> root ) {
     final Map<String, String> map = new HashMap<>( DEFAULT_MAP_SIZE );
     final TreeIterator iterator = new TreeIterator( root );
     iterator.forEachRemaining( item -> {
       if( item.isLeaf() ) {
         map.put( toPath( item.getParent() ), item.getValue() );
+      }
     } );
     return map;
+  }
   /**
    * For a given node, this will ascend the tree to generate a key name
    * that is associated with the leaf node's value.
+   *
    * @param node Ascendants represent the key to this node's value.
    * @param <T>  Data type that the {@link TreeItem} contains.
    * @return The string representation of the node's unique key.
    */
   public static <T> String toPath( TreeItem<T> node ) {
     assert node != null;
     final StringBuilder key = new StringBuilder( DEFAULT_KEY_LENGTH );
     final Stack<TreeItem<T>> stack = new Stack<>();
     while( node != null && !(node instanceof RootTreeItem) ) {
       stack.push( node );
       node = node.getParent();
+    }
     // Gets set at end of first iteration (to avoid an if condition).
     String separator = "";
     while( !stack.empty() ) {
       final T subkey = stack.pop().getValue();
       key.append( separator );
       key.append( subkey );
       separator = SEPARATOR;
+    }
     return YamlVariableDecorator.entoken( key.toString() );
+  }
+}

A src/main/java/com/scrivenvar/definition/VariableTreeItem.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import javafx.scene.control.TreeItem;
 import java.text.Normalizer;
 import java.util.Stack;
 import static com.scrivenvar.definition.FindMode.*;
 import static java.text.Normalizer.Form.NFD;
 /**
  * Provides behaviour afforded to variable names and their corresponding value.
+ *
  * @param <T> The type of TreeItem (usually String).
  * @author White Magic Software, Ltd.
  */
 public class VariableTreeItem<T> extends TreeItem<T> {
   /**
    * Constructs a new item with a default value.
+   *
    * @param value Passed up to superclass.
    */
   public VariableTreeItem( final T value ) {
     super( value );
+  }
   /**
    * Finds a leaf starting at the current node with text that matches the given
    * value.
+   *
    * @param text The text to match against each leaf in the tree.
    * @return The leaf that has a value starting with the given text.
    */
   public VariableTreeItem<T> findLeaf( final String text ) {
     return findLeaf( text, STARTS_WITH );
+  }
   /**
    * Finds a leaf starting at the current node with text that matches the given
    * value.
+   *
    * @param text     The text to match against each leaf in the tree.
    * @param findMode What algorithm is used to match the given text.
    * @return The leaf that has a value starting with the given text.
    */
   public VariableTreeItem<T> findLeaf(
       final String text, final FindMode findMode ) {
     final Stack<VariableTreeItem<T>> stack = new Stack<>();
     final VariableTreeItem<T> root = this;
     stack.push( root );
     // Don't try to find keys for blank/empty variable values.
     boolean found = text.isBlank();
     VariableTreeItem<T> node = null;
     while( !found && !stack.isEmpty() ) {
       node = stack.pop();
       if( findMode == EXACT && node.valueEquals( text ) ) {
         found = true;
+      }
       else if( findMode == CONTAINS && node.valueContains( text ) ) {
         found = true;
+      }
       else if( findMode == STARTS_WITH && node.valueStartsWith( text ) ) {
         found = true;
+      }
       else {
         for( final TreeItem<T> child : node.getChildren() ) {
           stack.push( (VariableTreeItem<T>) child );
+        }
         // No match found, yet.
         node = null;
+      }
+    }
     return node;
+  }
   /**
    * Returns the value of the string without diacritic marks.
+   *
    * @return A non-null, possibly empty string.
    */
   private String getDiacriticlessValue() {
     final String value = getValue().toString();
     final String normalized = Normalizer.normalize( value, NFD );
     return normalized.replaceAll( "\\p{M}", "" );
+  }
   /**
    * Returns true if this node is a leaf and its value starts with the given
    * text.
+   *
    * @param s The text to compare against the node value.
    * @return true Node is a leaf and its value starts with the given value.
    */
   private boolean valueStartsWith( final String s ) {
     return isLeaf() && getDiacriticlessValue().startsWith( s );
+  }
   /**
    * Returns true if this node is a leaf and its value contains the given text.
+   *
    * @param s The text to compare against the node value.
    * @return true Node is a leaf and its value contains the given value.
    */
   private boolean valueContains( final String s ) {
     return isLeaf() && getDiacriticlessValue().contains( s );
+  }
   /**
    * Returns true if this node is a leaf and its value equals the given text.
+   *
    * @param s The text to compare against the node value.
    * @return true Node is a leaf and its value equals the given value.
    */
   private boolean valueEquals( final String s ) {
     return isLeaf() && getValue().equals( s );
+  }
   /**
    * Returns the path for this node, with nodes made distinct using the
    * separator character. This uses two loops: one for pushing nodes onto a
    * stack and one for popping them off to create the path in desired order.
+   *
    * @return A non-null string, possibly empty.
    */
   public String toPath() {
     return TreeItemAdapter.toPath( getParent() );
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/YamlDefinitionSource.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import com.scrivenvar.definition.DefinitionSource;
 import com.scrivenvar.definition.TreeAdapter;
 import java.nio.file.Path;
 /**
  * Represents a definition data source for YAML files.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlDefinitionSource implements DefinitionSource {
   private final YamlTreeAdapter mYamlTreeAdapter;
   /**
    * Constructs a new YAML definition source, populated from the given file.
+   *
    * @param path Path to the YAML definition file.
    */
   public YamlDefinitionSource( final Path path ) {
     assert path != null;
     mYamlTreeAdapter = new YamlTreeAdapter( path );
+  }
   @Override
   public TreeAdapter getTreeAdapter() {
     return mYamlTreeAdapter;
+  }
   @Override
   public String getError() {
     return getYamlParser().getError();
+  }
   private YamlParser getYamlParser() {
     return mYamlTreeAdapter.getYamlParser();
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/YamlParser.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.scrivenvar.Messages;
 import com.scrivenvar.definition.DocumentParser;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import static com.scrivenvar.Constants.STATUS_BAR_OK;
 /**
  * Responsible for reading a YAML document into an object hierarchy.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlParser implements DocumentParser<JsonNode> {
   /**
    * Error that occurred while parsing.
    */
   private String mError;
   /**
    * Start of the Universe (the YAML document node that contains all others).
    */
   private final JsonNode mDocumentRoot;
   /**
    * Creates a new YamlParser instance that attempts to parse the contents
    * of the YAML document given from a path. In the event that the file either
    * does not exist or is empty, a fake
+   *
    * @param path Path to a file containing YAML data to parse.
    */
   public YamlParser( final Path path ) {
     assert path != null;
     mDocumentRoot = parse( path );
+  }
   /**
    * Returns the parent node for the entire YAML document tree.
+   *
    * @return The document root, never {@code null}.
    */
   @Override
   public JsonNode getDocumentRoot() {
     return mDocumentRoot;
+  }
   /**
    * Parses the given path containing YAML data into an object hierarchy.
+   *
    * @param path {@link Path} to the YAML resource to parse.
    * @return The parsed contents, or an empty object hierarchy.
    */
   private JsonNode parse( final Path path ) {
     try( final InputStream in = Files.newInputStream( path ) ) {
       setError( Messages.get( STATUS_BAR_OK ) );
       return new ObjectMapper( new YAMLFactory() ).readTree( in );
     } catch( final Exception e ) {
       setError( Messages.get( "yaml.error.open" ) );
       // Ensure that a document root node exists by relying on the
       // default failure condition when processing. This is required
       // because the input stream could not be read.
       return new ObjectMapper().createObjectNode();
+    }
+  }
   private void setError( final String error ) {
     mError = error;
+  }
   /**
    * Returns the last error message, if any, that occurred during parsing.
+   *
    * @return The error message or the empty string if no error occurred.
    */
   public String getError() {
     return mError;
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/YamlTreeAdapter.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import com.scrivenvar.definition.RootTreeItem;
 import com.scrivenvar.definition.TreeAdapter;
 import com.scrivenvar.definition.VariableTreeItem;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map.Entry;
 /**
  * Transforms a JsonNode hierarchy into a tree that can be displayed in a user
  * interface and vice-versa.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlTreeAdapter implements TreeAdapter {
   private final YamlParser mParser;
   /**
    * Constructs a new instance that will use the given path to read
    * the object hierarchy from a data source.
+   *
    * @param path Path to YAML contents to parse.
    */
   public YamlTreeAdapter( final Path path ) {
     mParser = new YamlParser( path );
+  }
   @Override
   public void export( final TreeItem<String> treeItem, final Path path )
       throws IOException {
     final YAMLMapper mapper = new YAMLMapper();
     final ObjectNode root = mapper.createObjectNode();
     // Iterate over the root item's children. The root item is used by the
     // application to ensure definitions can always be added to a tree, as
     // such it is not meant to be exported, only its children.
     for( final TreeItem<String> child : treeItem.getChildren() ) {
       export( child, root );
+    }
     // Writes as UTF8 by default.
     mapper.writeValue( path.toFile(), root );
+  }
   /**
    * Recursive method to generate an object hierarchy that represents the
    * given {@link TreeItem} hierarchy.
+   *
    * @param item The {@link TreeItem} to reproduce as an object hierarchy.
    * @param node The {@link ObjectNode} to update to reflect the
    *             {@link TreeItem} hierarchy.
    */
   private void export( final TreeItem<String> item, ObjectNode node ) {
     final var children = item.getChildren();
     // If the current item has more than one non-leaf child, it's an
     // object node and must become a new nested object.
     if( !(children.size() == 1 && children.get( 0 ).isLeaf()) ) {
       node = node.putObject( item.getValue() );
+    }
     for( final TreeItem<String> child : children ) {
       if( child.isLeaf() ) {
         node.put( item.getValue(), child.getValue() );
+      }
       else {
         export( child, node );
+      }
+    }
+  }
   /**
    * Converts a YAML document to a {@link TreeItem} based on the document
    * keys. Only the first document in the stream is adapted.
+   *
    * @param root Root {@link TreeItem} node name.
    * @return A {@link TreeItem} populated with all the keys in the YAML
    * document.
    */
   public TreeItem<String> adapt( final String root ) {
     final JsonNode rootNode = getYamlParser().getDocumentRoot();
     final TreeItem<String> rootItem = createRootTreeItem( root );
     rootItem.setExpanded( true );
     adapt( rootNode, rootItem );
     return rootItem;
+  }
   /**
    * Iterate over a given root node (at any level of the tree) and adapt each
    * leaf node.
+   *
    * @param rootNode A JSON node (YAML node) to adapt.
    * @param rootItem The tree item to use as the root when processing the node.
    */
   private void adapt(
       final JsonNode rootNode, final TreeItem<String> rootItem ) {
     rootNode.fields().forEachRemaining(
         ( Entry<String, JsonNode> leaf ) -> adapt( leaf, rootItem )
     );
+  }
   /**
    * Recursively adapt each rootNode to a corresponding rootItem.
+   *
    * @param rootNode The node to adapt.
    * @param rootItem The item to adapt using the node's key.
    */
   private void adapt(
       final Entry<String, JsonNode> rootNode,
       final TreeItem<String> rootItem ) {
     final JsonNode leafNode = rootNode.getValue();
     final String key = rootNode.getKey();
     final TreeItem<String> leaf = createTreeItem( key );
     if( leafNode.isValueNode() ) {
       leaf.getChildren().add( createTreeItem( rootNode.getValue().asText() ) );
+    }
     rootItem.getChildren().add( leaf );
     if( leafNode.isObject() ) {
       adapt( leafNode, leaf );
+    }
+  }
   /**
    * Creates a new {@link TreeItem} that can be added to the {@link TreeView}.
+   *
    * @param value The node's value.
    * @return A new {@link TreeItem}, never {@code null}.
    */
   private TreeItem<String> createTreeItem( final String value ) {
     return new VariableTreeItem<>( value );
+  }
   /**
    * Creates a new {@link TreeItem} that is intended to be the root-level item
    * added to the {@link TreeView}. This allows the root item to be
    * distinguished from the other items so that reference keys do not include
    * "Definition" as part of their name.
+   *
    * @param value The node's value.
    * @return A new {@link TreeItem}, never {@code null}.
    */
   private TreeItem<String> createRootTreeItem( final String value ) {
     return new RootTreeItem<>( value );
+  }
   public YamlParser getYamlParser() {
     return mParser;
+  }
+}

A src/main/java/com/scrivenvar/dialogs/AbstractDialog.java

 /*
  * Copyright 2017 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.dialogs;
 import static com.scrivenvar.Messages.get;
 import com.scrivenvar.service.events.impl.ButtonOrderPane;
 import static javafx.scene.control.ButtonType.CANCEL;
 import static javafx.scene.control.ButtonType.OK;
 import javafx.scene.control.Dialog;
 import javafx.stage.Window;
 /**
  * Superclass that abstracts common behaviours for all dialogs.
+ *
  * @author White Magic Software, Ltd.
  * @param <T> The type of dialog to create (usually String).
  */
 public abstract class AbstractDialog<T> extends Dialog<T> {
   /**
    * Ensures that all dialogs can be closed.
+   *
    * @param owner The parent window of this dialog.
    * @param title The messages title to display in the title bar.
    */
   @SuppressWarnings( "OverridableMethodCallInConstructor" )
   public AbstractDialog( final Window owner, final String title ) {
     setTitle( get( title ) );
     setResizable( true );
     initOwner( owner );
     initCloseAction();
     initDialogPane();
     initDialogButtons();
     initComponents();
+  }
   /**
    * Initialize the component layout.
    */
   protected abstract void initComponents();
   /**
    * Set the dialog to use a button order pane with an OK and a CANCEL button.
    */
   protected void initDialogPane() {
     setDialogPane( new ButtonOrderPane() );
+  }
   /**
    * Set an OK and CANCEL button on the dialog.
    */
   protected void initDialogButtons() {
     getDialogPane().getButtonTypes().addAll( OK, CANCEL );
+  }
   /**
    * Attaches a setOnCloseRequest to the dialog's [X] button so that the user
    * can always close the window, even if there's an error.
    */
   protected final void initCloseAction() {
     final Window window = getDialogPane().getScene().getWindow();
     window.setOnCloseRequest( event -> window.hide() );
+  }
+}

A src/main/java/com/scrivenvar/dialogs/ImageDialog.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.dialogs;
 import static com.scrivenvar.Messages.get;
 import com.scrivenvar.controls.BrowseFileButton;
 import com.scrivenvar.controls.EscapeTextField;
 import java.nio.file.Path;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.ButtonBar.ButtonData;
 import static javafx.scene.control.ButtonType.OK;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Window;
 import org.tbee.javafx.scene.layout.fxml.MigPane;
 /**
  * Dialog to enter a markdown image.
+ *
  * @author Karl Tauber
  */
 public class ImageDialog extends AbstractDialog<String> {
   private final StringProperty image = new SimpleStringProperty();
   public ImageDialog( final Window owner, final Path basePath ) {
     super(owner, "Dialog.image.title" );
     final DialogPane dialogPane = getDialogPane();
     dialogPane.setContent( pane );
     linkBrowseFileButton.setBasePath( basePath );
     linkBrowseFileButton.addExtensionFilter( new ExtensionFilter( get( "Dialog.image.chooser.imagesFilter" ), "*.png", "*.gif", "*.jpg" ) );
     linkBrowseFileButton.urlProperty().bindBidirectional( urlField.escapedTextProperty() );
     dialogPane.lookupButton( OK ).disableProperty().bind(
       urlField.escapedTextProperty().isEmpty()
       .or( textField.escapedTextProperty().isEmpty() ) );
     image.bind( Bindings.when( titleField.escapedTextProperty().isNotEmpty() )
       .then( Bindings.format( "![%s](%s \"%s\")", textField.escapedTextProperty(), urlField.escapedTextProperty(), titleField.escapedTextProperty() ) )
       .otherwise( Bindings.format( "![%s](%s)", textField.escapedTextProperty(), urlField.escapedTextProperty() ) ) );
     previewField.textProperty().bind( image );
     setResultConverter( dialogButton -> {
       ButtonData data = (dialogButton != null) ? dialogButton.getButtonData() : null;
       return (data == ButtonData.OK_DONE) ? image.get() : null;
     } );
     Platform.runLater( () -> {
       urlField.requestFocus();
       if( urlField.getText().startsWith( "http://" ) ) {
         urlField.selectRange( "http://".length(), urlField.getLength() );
+      }
     } );
+  }
   @Override
   protected void initComponents() {
     // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
     pane = new MigPane();
     Label urlLabel = new Label();
     urlField = new EscapeTextField();
     linkBrowseFileButton = new BrowseFileButton();
     Label textLabel = new Label();
     textField = new EscapeTextField();
     Label titleLabel = new Label();
     titleField = new EscapeTextField();
     Label previewLabel = new Label();
     previewField = new Label();
     //======== pane ========
+    {
       pane.setCols( "[shrink 0,fill][300,grow,fill][fill]" );
       pane.setRows( "[][][][]" );
       //---- urlLabel ----
       urlLabel.setText( get( "Dialog.image.urlLabel.text" ) );
       pane.add( urlLabel, "cell 0 0" );
       //---- urlField ----
       urlField.setEscapeCharacters( "()" );
       urlField.setText( "http://yourlink.com" );
       urlField.setPromptText( "http://yourlink.com" );
       pane.add( urlField, "cell 1 0" );
       pane.add( linkBrowseFileButton, "cell 2 0" );
       //---- textLabel ----
       textLabel.setText( get( "Dialog.image.textLabel.text" ) );
       pane.add( textLabel, "cell 0 1" );
       //---- textField ----
       textField.setEscapeCharacters( "[]" );
       pane.add( textField, "cell 1 1 2 1" );
       //---- titleLabel ----
       titleLabel.setText( get( "Dialog.image.titleLabel.text" ) );
       pane.add( titleLabel, "cell 0 2" );
       pane.add( titleField, "cell 1 2 2 1" );
       //---- previewLabel ----
       previewLabel.setText( get( "Dialog.image.previewLabel.text" ) );
       pane.add( previewLabel, "cell 0 3" );
       pane.add( previewField, "cell 1 3 2 1" );
+    }
     // JFormDesigner - End of component initialization  //GEN-END:initComponents
+  }
   // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
   private MigPane pane;
   private EscapeTextField urlField;
   private BrowseFileButton linkBrowseFileButton;
   private EscapeTextField textField;
   private EscapeTextField titleField;
   private Label previewField;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
+}

A src/main/java/com/scrivenvar/dialogs/ImageDialog.jfd

 JFDML JFormDesigner: "9.9.9.9.9999" Java: "1.8.0_66" encoding: "UTF-8"
 new FormModel {
 	"i18n.bundlePackage": "com.scrivendor"
 	"i18n.bundleName": "messages"
 	"i18n.autoExternalize": true
 	"i18n.keyPrefix": "ImageDialog"
 	contentType: "form/javafx"
 	root: new FormRoot {
 		add( new FormContainer( "org.tbee.javafx.scene.layout.fxml.MigPane", new FormLayoutManager( class org.tbee.javafx.scene.layout.fxml.MigPane ) {
 			"$layoutConstraints": ""
 			"$columnConstraints": "[shrink 0,fill][300,grow,fill][fill]"
 			"$rowConstraints": "[][][][]"
 		} ) {
 			name: "pane"
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "urlLabel"
 				"text": new FormMessage( null, "ImageDialog.urlLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "urlField"
 				"escapeCharacters": "()"
 				"text": "http://yourlink.com"
 				"promptText": "http://yourlink.com"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.BrowseFileButton" ) {
 				name: "linkBrowseFileButton"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 0"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "textLabel"
 				"text": new FormMessage( null, "ImageDialog.textLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 1"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "textField"
 				"escapeCharacters": "[]"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 1 2 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "titleLabel"
 				"text": new FormMessage( null, "ImageDialog.titleLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 2"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "titleField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 2 2 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewLabel"
 				"text": new FormMessage( null, "ImageDialog.previewLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 3"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 3 2 1"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new javafx.geometry.Point2D( 0.0, 0.0 )
 			"size": new javafx.geometry.Dimension2D( 500.0, 300.0 )
 		} )
+	}
+}

A src/main/java/com/scrivenvar/dialogs/LinkDialog.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.dialogs;
 import com.scrivenvar.controls.EscapeTextField;
 import com.scrivenvar.editors.markdown.HyperlinkModel;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;
 import javafx.stage.Window;
 import org.tbee.javafx.scene.layout.fxml.MigPane;
 import static com.scrivenvar.Messages.get;
 import static javafx.scene.control.ButtonType.OK;
 /**
  * Dialog to enter a markdown link.
+ *
  * @author Karl Tauber
  */
 public class LinkDialog extends AbstractDialog<String> {
   private final StringProperty link = new SimpleStringProperty();
   public LinkDialog(
     final Window owner, final HyperlinkModel hyperlink ) {
     super( owner, "Dialog.link.title" );
     final DialogPane dialogPane = getDialogPane();
     dialogPane.setContent( pane );
     dialogPane.lookupButton( OK ).disableProperty().bind(
       urlField.escapedTextProperty().isEmpty() );
     textField.setText( hyperlink.getText() );
     urlField.setText( hyperlink.getUrl() );
     titleField.setText( hyperlink.getTitle() );
     link.bind( Bindings.when( titleField.escapedTextProperty().isNotEmpty() )
       .then( Bindings.format( "[%s](%s \"%s\")", textField.escapedTextProperty(), urlField.escapedTextProperty(), titleField.escapedTextProperty() ) )
       .otherwise( Bindings.when( textField.escapedTextProperty().isNotEmpty() )
         .then( Bindings.format( "[%s](%s)", textField.escapedTextProperty(), urlField.escapedTextProperty() ) )
         .otherwise( urlField.escapedTextProperty() ) ) );
     setResultConverter( dialogButton -> {
       ButtonData data = (dialogButton != null) ? dialogButton.getButtonData() : null;
       return (data == ButtonData.OK_DONE) ? link.get() : null;
     } );
     Platform.runLater( () -> {
       urlField.requestFocus();
       urlField.selectRange( 0, urlField.getLength() );
     } );
+  }
   @Override
   protected void initComponents() {
     // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
     pane = new MigPane();
     Label urlLabel = new Label();
     urlField = new EscapeTextField();
     Label textLabel = new Label();
     textField = new EscapeTextField();
     Label titleLabel = new Label();
     titleField = new EscapeTextField();
     //======== pane ========
+    {
       pane.setCols( "[shrink 0,fill][300,grow,fill][fill][fill]" );
       pane.setRows( "[][][][]" );
       //---- urlLabel ----
       urlLabel.setText( get( "Dialog.link.urlLabel.text" ) );
       pane.add( urlLabel, "cell 0 0" );
       //---- urlField ----
       urlField.setEscapeCharacters( "()" );
       pane.add( urlField, "cell 1 0" );
       //---- textLabel ----
       textLabel.setText( get( "Dialog.link.textLabel.text" ) );
       pane.add( textLabel, "cell 0 1" );
       //---- textField ----
       textField.setEscapeCharacters( "[]" );
       pane.add( textField, "cell 1 1 3 1" );
       //---- titleLabel ----
       titleLabel.setText( get( "Dialog.link.titleLabel.text" ) );
       pane.add( titleLabel, "cell 0 2" );
       pane.add( titleField, "cell 1 2 3 1" );
+    }
     // JFormDesigner - End of component initialization  //GEN-END:initComponents
+  }
   // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
   private MigPane pane;
   private EscapeTextField urlField;
   private EscapeTextField textField;
   private EscapeTextField titleField;
   // JFormDesigner - End of variables declaration  //GEN-END:variables
+}

A src/main/java/com/scrivenvar/dialogs/LinkDialog.jfd

 JFDML JFormDesigner: "9.9.9.9.9999" Java: "1.8.0_66" encoding: "UTF-8"
 new FormModel {
 	"i18n.bundlePackage": "com.scrivendor"
 	"i18n.bundleName": "messages"
 	"i18n.autoExternalize": true
 	"i18n.keyPrefix": "LinkDialog"
 	contentType: "form/javafx"
 	root: new FormRoot {
 		add( new FormContainer( "org.tbee.javafx.scene.layout.fxml.MigPane", new FormLayoutManager( class org.tbee.javafx.scene.layout.fxml.MigPane ) {
 			"$layoutConstraints": ""
 			"$columnConstraints": "[shrink 0,fill][300,grow,fill][fill][fill]"
 			"$rowConstraints": "[][][][]"
 		} ) {
 			name: "pane"
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "urlLabel"
 				"text": new FormMessage( null, "LinkDialog.urlLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "urlField"
 				"escapeCharacters": "()"
 				"text": "http://yourlink.com"
 				"promptText": "http://yourlink.com"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.BrowseDirectoryButton" ) {
 				name: "linkBrowseDirectoyButton"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.BrowseFileButton" ) {
 				name: "linkBrowseFileButton"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 0"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "textLabel"
 				"text": new FormMessage( null, "LinkDialog.textLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 1"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "textField"
 				"escapeCharacters": "[]"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 1 3 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "titleLabel"
 				"text": new FormMessage( null, "LinkDialog.titleLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 2"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "titleField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 2 3 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewLabel"
 				"text": new FormMessage( null, "LinkDialog.previewLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 3"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 3 3 1"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new javafx.geometry.Point2D( 0.0, 0.0 )
 			"size": new javafx.geometry.Dimension2D( 500.0, 300.0 )
 		} )
+	}
+}

A src/main/java/com/scrivenvar/dialogs/RScriptDialog.java

 /*
  * Copyright 2017 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.dialogs;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Window;
 import static com.scrivenvar.Messages.get;
 import static javafx.scene.control.ButtonType.OK;
 /**
  * Responsible for managing the R startup script that is run when an R source
  * file is loaded.
+ *
  * @author White Magic Software, Ltd.
  */
 public class RScriptDialog extends AbstractDialog<String> {
   private TextArea mScriptArea;
   private final String mOriginalText;
   public RScriptDialog(
       final Window parent, final String title, final String script ) {
     super( parent, title );
     mOriginalText = script;
     getScriptArea().setText( script );
+  }
   @Override
   protected void initComponents() {
     final GridPane grid = new GridPane();
     grid.setHgap( 10 );
     grid.setVgap( 10 );
     grid.setPadding( new Insets( 10, 10, 10, 10 ) );
     final Label label = new Label( get( "Dialog.r.script.content" ) );
     final TextArea textArea = getScriptArea();
     textArea.setEditable( true );
     textArea.setWrapText( true );
     grid.add( label, 0, 0 );
     grid.add( textArea, 0, 1 );
     getDialogPane().setContent( grid );
     Platform.runLater( textArea::requestFocus );
     setResultConverter(
         dialogButton -> dialogButton == OK ?
             textArea.getText() :
             getOriginalText()
     );
+  }
   private TextArea getScriptArea() {
     if( mScriptArea == null ) {
       mScriptArea = new TextArea();
+    }
     return mScriptArea;
+  }
   private String getOriginalText() {
     return mOriginalText;
+  }
+}

A src/main/java/com/scrivenvar/editors/EditorPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors;
 import com.scrivenvar.AbstractPane;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.event.Event;
 import javafx.scene.control.ScrollPane;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.StyleClassedTextArea;
 import org.fxmisc.undo.UndoManager;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import org.fxmisc.wellbehaved.event.Nodes;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 /**
  * Represents common editing features for various types of text editors.
+ *
  * @author White Magic Software, Ltd.
  */
 public class EditorPane extends AbstractPane {
   private final StyleClassedTextArea mEditor =
       new StyleClassedTextArea( false );
   private final VirtualizedScrollPane<StyleClassedTextArea> mScrollPane =
       new VirtualizedScrollPane<>( mEditor );
   private final ObjectProperty<Path> mPath = new SimpleObjectProperty<>();
   public EditorPane() {
     getScrollPane().setVbarPolicy( ScrollPane.ScrollBarPolicy.ALWAYS );
+  }
   @Override
   public void requestFocus() {
     Platform.runLater( () -> getEditor().requestFocus() );
+  }
   public void undo() {
     getUndoManager().undo();
+  }
   public void redo() {
     getUndoManager().redo();
+  }
   public UndoManager<?> getUndoManager() {
     return getEditor().getUndoManager();
+  }
   public String getText() {
     return getEditor().getText();
+  }
   public void setText( final String text ) {
     final var editor = getEditor();
     editor.deselect();
     editor.replaceText( text );
     getUndoManager().mark();
+  }
   /**
    * Call to hook into changes to the text area.
+   *
    * @param listener Receives editor text change events.
    */
   public void addTextChangeListener(
       final ChangeListener<? super String> listener ) {
     getEditor().textProperty().addListener( listener );
+  }
   /**
    * Call to listen for when the caret moves to another paragraph.
+   *
    * @param listener Receives paragraph change events.
    */
   public void addCaretParagraphListener(
       final ChangeListener<? super Integer> listener ) {
     getEditor().currentParagraphProperty().addListener( listener );
+  }
   /**
    * This method adds listeners to editor events.
+   *
    * @param <T>      The event type.
    * @param <U>      The consumer type for the given event type.
    * @param event    The event of interest.
    * @param consumer The method to call when the event happens.
    */
   public <T extends Event, U extends T> void addKeyboardListener(
       final EventPattern<? super T, ? extends U> event,
       final Consumer<? super U> consumer ) {
     Nodes.addInputMap( getEditor(), consume( event, consumer ) );
+  }
   /**
    * Repositions the cursor and scroll bar to the top of the file.
    */
   public void scrollToTop() {
     getEditor().moveTo( 0 );
     getScrollPane().scrollYToPixel( 0 );
+  }
   public StyleClassedTextArea getEditor() {
     return mEditor;
+  }
   /**
    * Returns the scroll pane that contains the text area.
+   *
    * @return The scroll pane that contains the content to edit.
    */
   public VirtualizedScrollPane<StyleClassedTextArea> getScrollPane() {
     return mScrollPane;
+  }
   public Path getPath() {
     return mPath.get();
+  }
   public void setPath( final Path path ) {
     mPath.set( path );
+  }
+}

A src/main/java/com/scrivenvar/editors/VariableNameDecoratorFactory.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors;
 import com.scrivenvar.AbstractFileFactory;
 import com.scrivenvar.decorators.RVariableDecorator;
 import com.scrivenvar.decorators.VariableDecorator;
 import com.scrivenvar.decorators.YamlVariableDecorator;
 import java.nio.file.Path;
 /**
  * Responsible for creating a variable name decorator suited to a particular
  * file type.
+ *
  * @author White Magic Software, Ltd.
  */
 public class VariableNameDecoratorFactory extends AbstractFileFactory {
   private VariableNameDecoratorFactory() {
+  }
   public static VariableDecorator newInstance( final Path path ) {
     final var factory = new VariableNameDecoratorFactory();
     final VariableDecorator result;
     switch( factory.lookup( path ) ) {
       case RMARKDOWN:
       case RXML:
         result = new RVariableDecorator();
         break;
       default:
         result = new YamlVariableDecorator();
         break;
+    }
     return result;
+  }
+}

A src/main/java/com/scrivenvar/editors/VariableNameInjector.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors;
 import com.scrivenvar.FileEditorTab;
 import com.scrivenvar.decorators.VariableDecorator;
 import com.scrivenvar.definition.DefinitionPane;
 import com.scrivenvar.definition.FindMode;
 import com.scrivenvar.definition.VariableTreeItem;
 import javafx.event.Event;
 import javafx.scene.control.TreeItem;
 import javafx.scene.input.KeyEvent;
 import org.fxmisc.richtext.StyledTextArea;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import java.nio.file.Path;
 import java.text.BreakIterator;
 import java.util.function.Consumer;
 import static com.scrivenvar.definition.FindMode.*;
 import static javafx.scene.input.KeyCode.SPACE;
 import static javafx.scene.input.KeyCombination.CONTROL_DOWN;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 /**
  * Provides the logic for injecting variable names within the editor.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class VariableNameInjector {
   /**
    * Recipient of name injections.
    */
   private FileEditorTab mTab;
   /**
    * Initiates double-click events.
    */
   private DefinitionPane mDefinitionPane;
   /**
    * Initializes the variable name injector against the given pane.
+   *
    * @param tab  The tab to inject variable names into.
    * @param pane The definition panel to listen to for double-click events.
    */
   public VariableNameInjector(
       final FileEditorTab tab, final DefinitionPane pane ) {
     setFileEditorTab( tab );
     setDefinitionPane( pane );
     initKeyboardEventListeners();
+  }
   /**
    * Trap control+space and the @ key.
+   *
    * @param tab The file editor that sends keyboard events for variable name
    *            injection.
    */
   public void initKeyboardEventListeners( final FileEditorTab tab ) {
     setFileEditorTab( tab );
     initKeyboardEventListeners();
+  }
   /**
    * Inserts the variable
    */
   public void injectSelectedItem() {
     final TreeItem<String> item = getDefinitionPane().getSelectedItem();
     if( item.isLeaf() ) {
       // This avoids a direct typecast.
       final VariableTreeItem<String> leaf = getDefinitionPane().findLeaf(
           item.getValue(), FindMode.EXACT );
       final StyledTextArea<?, ?> editor = getEditor();
       editor.insertText( editor.getCaretPosition(), decorate( leaf ) );
+    }
+  }
   /**
    * Traps Control+SPACE to auto-insert definition key names.
    */
   private void initKeyboardEventListeners() {
     addKeyboardListener(
         keyPressed( SPACE, CONTROL_DOWN ),
         this::autoinsert
     );
+  }
   /**
    * Pressing Control+SPACE will find a node that matches the current word and
    * substitute the YAML variable reference.
+   *
    * @param e Ignored -- it can only be Control+SPACE.
    */
   private void autoinsert( final KeyEvent e ) {
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundariesAtCaret();
     final String word = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     final VariableTreeItem<String> leaf = findLeaf( word );
     if( leaf != null ) {
       replaceText( boundaries[ 0 ], boundaries[ 1 ], decorate( leaf ) );
       expand( leaf );
+    }
+  }
   private int[] getWordBoundariesAtCaret() {
     final String paragraph = getCaretParagraph();
     int offset = getCurrentCaretColumn();
     final BreakIterator wordBreaks = BreakIterator.getWordInstance();
     wordBreaks.setText( paragraph );
     // Scan back until the first word is found.
     while( offset > 0 && wordBreaks.isBoundary( offset ) ) {
       offset--;
+    }
     final int[] boundaries = new int[ 2 ];
     boundaries[ 1 ] = wordBreaks.following( offset );
     boundaries[ 0 ] = wordBreaks.previous();
     return boundaries;
+  }
   /**
    * Decorates a {@link TreeItem} using the syntax specific to the type of
    * document being edited.
+   *
    * @param leaf The path to the leaf (the definition key) to be decorated.
    */
   private String decorate( final VariableTreeItem<String> leaf ) {
     return decorate( leaf.toPath() );
+  }
   /**
    * Decorates a variable using the syntax specific to the type of document
    * being edited.
+   *
    * @param variable The variable to decorate in dot-notation without any
    *                 start or end sigils present.
    */
   private String decorate( final String variable ) {
     return getVariableDecorator().decorate( variable );
+  }
   /**
    * Updates the text at the given position within the current paragraph.
+   *
    * @param posBegan The starting index in the paragraph text to replace.
    * @param posEnded The ending index in the paragraph text to replace.
    * @param text     Overwrite the paragraph substring with this text.
    */
   private void replaceText(
       final int posBegan, final int posEnded, final String text ) {
     final int p = getCurrentParagraph();
     getEditor().replaceText( p, posBegan, p, posEnded, text );
+  }
   /**
    * Returns the caret's current paragraph position.
+   *
    * @return A number greater than or equal to 0.
    */
   private int getCurrentParagraph() {
     return getEditor().getCurrentParagraph();
+  }
   /**
    * Returns the text for the paragraph that contains the caret.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCaretParagraph() {
     return getEditor().getText( getCurrentParagraph() );
+  }
   /**
    * Returns the caret position within the current paragraph.
+   *
    * @return A value from 0 to the length of the current paragraph.
    */
   private int getCurrentCaretColumn() {
     return getEditor().getCaretColumn();
+  }
   private VariableTreeItem<String> findLeaf( final String word ) {
     assert word != null;
     VariableTreeItem<String> leaf = findLeafExact( word );
     leaf = leaf == null ? findLeafStartsWith( word ) : leaf;
     leaf = leaf == null ? findLeafContains( word ) : leaf;
     leaf = leaf == null ? findLeafLevenshtein( word ) : leaf;
     return leaf;
+  }
   private VariableTreeItem<String> findLeafExact( final String text ) {
     return findLeaf( text, EXACT );
+  }
   private VariableTreeItem<String> findLeafContains( final String text ) {
     return findLeaf( text, CONTAINS );
+  }
   private VariableTreeItem<String> findLeafStartsWith( final String text ) {
     return findLeaf( text, STARTS_WITH );
+  }
   private VariableTreeItem<String> findLeafLevenshtein( final String text ) {
     return findLeaf( text, LEVENSHTEIN );
+  }
   /**
    * Finds the first leaf having a value that starts with the given text, or
    * contains the text if contains is true.
+   *
    * @param text     The text to find in the definition tree.
    * @param findMode Dictates what search criteria to use for matching words.
    * @return The leaf that starts with the given text, or null if not found.
    */
   private VariableTreeItem<String> findLeaf(
       final String text, final FindMode findMode ) {
     return getDefinitionPane().findLeaf( text, findMode );
+  }
   /**
    * Collapses the tree then expands and selects the given node.
+   *
    * @param node The node to expand.
    */
   private void expand( final TreeItem<String> node ) {
     final DefinitionPane pane = getDefinitionPane();
     pane.collapse();
     pane.expand( node );
     pane.select( node );
+  }
   /**
    * @return A variable decorator that corresponds to the given file type.
    */
   private VariableDecorator getVariableDecorator() {
     return VariableNameDecoratorFactory.newInstance( getFilename() );
+  }
   private Path getFilename() {
     return getFileEditorTab().getPath();
+  }
   private EditorPane getEditorPane() {
     return getFileEditorTab().getEditorPane();
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
    */
   private <T extends Event, U extends T> void addKeyboardListener(
       final EventPattern<? super T, ? extends U> event,
       final Consumer<? super U> consumer ) {
     getEditorPane().addKeyboardListener( event, consumer );
+  }
   private StyledTextArea<?, ?> getEditor() {
     return getEditorPane().getEditor();
+  }
   public FileEditorTab getFileEditorTab() {
     return mTab;
+  }
   public void setFileEditorTab( final FileEditorTab tab ) {
     mTab = tab;
+  }
   private DefinitionPane getDefinitionPane() {
     return mDefinitionPane;
+  }
   private void setDefinitionPane( final DefinitionPane definitionPane ) {
     mDefinitionPane = definitionPane;
+  }
+}

A src/main/java/com/scrivenvar/editors/markdown/HyperlinkModel.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors.markdown;
 import com.vladsch.flexmark.ast.Link;
 /**
  * Represents the model for a hyperlink: text and url text.
+ *
  * @author White Magic Software, Ltd.
  */
 public class HyperlinkModel {
   private String text;
   private String url;
   private String title;
   /**
    * Constructs a new hyperlink model in Markdown format by default with no
    * title (i.e., tooltip).
+   *
    * @param text The hyperlink text displayed (e.g., displayed to the user).
    * @param url The destination URL (e.g., when clicked).
    */
   public HyperlinkModel( final String text, final String url ) {
     this( text, url, null );
+  }
   /**
    * Constructs a new hyperlink model for the given AST link.
+   *
    * @param link A markdown link.
    */
   public HyperlinkModel( final Link link ) {
     this(
       link.getText().toString(),
       link.getUrl().toString(),
       link.getTitle().toString()
     );
+  }
   /**
    * Constructs a new hyperlink model in Markdown format by default.
+   *
    * @param text The hyperlink text displayed (e.g., displayed to the user).
    * @param url The destination URL (e.g., when clicked).
    * @param title The hyperlink title (e.g., shown as a tooltip).
    */
   public HyperlinkModel( final String text, final String url, final String title ) {
     setText( text );
     setUrl( url );
     setTitle( title );
+  }
   /**
    * Returns the string in Markdown format by default.
+   *
    * @return A markdown version of the hyperlink.
    */
   @Override
   public String toString() {
     String format = "%s%s%s";
     if( hasText() ) {
       format = "[%s]" + (hasTitle() ? "(%s \"%s\")" : "(%s%s)");
+    }
     // Becomes ""+URL+"" if no text is set.
     // Becomes [TITLE]+(URL)+"" if no title is set.
     // Becomes [TITLE]+(URL+ \"TITLE\") if title is set.
     return String.format( format, getText(), getUrl(), getTitle() );
+  }
   public final void setText( final String text ) {
     this.text = nullSafe( text );
+  }
   public final void setUrl( final String url ) {
     this.url = nullSafe( url );
+  }
   public final void setTitle( final String title ) {
     this.title = nullSafe( title );
+  }
   /**
    * Answers whether text has been set for the hyperlink.
+   *
    * @return true This is a text link.
    */
   public boolean hasText() {
     return !getText().isEmpty();
+  }
   /**
    * Answers whether a title (tooltip) has been set for the hyperlink.
+   *
    * @return true There is a title.
    */
   public boolean hasTitle() {
     return !getTitle().isEmpty();
+  }
   public String getText() {
     return this.text;
+  }
   public String getUrl() {
     return this.url;
+  }
   public String getTitle() {
     return this.title;
+  }
   private String nullSafe( final String s ) {
     return s == null ? "" : s;
+  }
+}

A src/main/java/com/scrivenvar/editors/markdown/LinkVisitor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors.markdown;
 import com.vladsch.flexmark.ast.Link;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.ast.NodeVisitor;
 import com.vladsch.flexmark.util.ast.VisitHandler;
 /**
  * @author White Magic Software, Ltd.
  */
 public class LinkVisitor {
   private NodeVisitor visitor;
   private Link link;
   private final int offset;
   /**
    * Creates a hyperlink given an offset into a paragraph and the markdown AST
    * link node.
+   *
    * @param index Index into the paragraph that indicates the hyperlink to
    *              change.
    */
   public LinkVisitor( final int index ) {
     this.offset = index;
+  }
   public Link process( final Node root ) {
     getVisitor().visit( root );
     return getLink();
+  }
   /**
    * @param link Not null.
    */
   private void visit( final Link link ) {
     final int began = link.getStartOffset();
     final int ended = link.getEndOffset();
     final int index = getOffset();
     if( index >= began && index <= ended ) {
       setLink( link );
+    }
+  }
   private synchronized NodeVisitor getVisitor() {
     if( this.visitor == null ) {
       this.visitor = createVisitor();
+    }
     return this.visitor;
+  }
   protected NodeVisitor createVisitor() {
     return new NodeVisitor(
         new VisitHandler<>( Link.class, LinkVisitor.this::visit ) );
+  }
   private Link getLink() {
     return this.link;
+  }
   private void setLink( final Link link ) {
     this.link = link;
+  }
   public int getOffset() {
     return this.offset;
+  }
+}

A src/main/java/com/scrivenvar/editors/markdown/MarkdownEditorPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors.markdown;
 import com.scrivenvar.dialogs.ImageDialog;
 import com.scrivenvar.dialogs.LinkDialog;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.processors.markdown.MarkdownProcessor;
 import com.vladsch.flexmark.ast.Link;
 import com.vladsch.flexmark.util.ast.Node;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.IndexRange;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Window;
 import org.fxmisc.richtext.StyleClassedTextArea;
 import java.nio.file.Path;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import static com.scrivenvar.Constants.STYLESHEET_MARKDOWN;
 import static com.scrivenvar.util.Utils.ltrim;
 import static com.scrivenvar.util.Utils.rtrim;
 import static javafx.scene.input.KeyCode.ENTER;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 /**
  * Markdown editor pane.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class MarkdownEditorPane extends EditorPane {
   private static final Pattern AUTO_INDENT_PATTERN = Pattern.compile(
       "(\\s*[*+-]\\s+|\\s*[0-9]+\\.\\s+|\\s+)(.*)" );
   public MarkdownEditorPane() {
     initEditor();
+  }
   private void initEditor() {
     final StyleClassedTextArea textArea = getEditor();
     textArea.setWrapText( true );
     textArea.getStyleClass().add( "markdown-editor" );
     textArea.getStylesheets().add( STYLESHEET_MARKDOWN );
     addKeyboardListener( keyPressed( ENTER ), this::enterPressed );
+  }
   private void enterPressed( final KeyEvent e ) {
     final StyleClassedTextArea textArea = getEditor();
     final String currentLine =
         textArea.getText( textArea.getCurrentParagraph() );
     final Matcher matcher = AUTO_INDENT_PATTERN.matcher( currentLine );
     String newText = "\n";
     if( matcher.matches() ) {
       if( !matcher.group( 2 ).isEmpty() ) {
         // indent new line with same whitespace characters and list markers
         // as current line
         newText = newText.concat( matcher.group( 1 ) );
+      }
       else {
         // current line contains only whitespace characters and list markers
         // --> empty current line
         final int caretPosition = textArea.getCaretPosition();
         textArea.selectRange( caretPosition - currentLine.length(),
                               caretPosition );
+      }
+    }
     textArea.replaceSelection( newText );
     // Ensure that the window scrolls when Enter is pressed at the bottom of
     // the pane.
     textArea.requestFollowCaret();
+  }
   public void surroundSelection( final String leading, final String trailing ) {
     surroundSelection( leading, trailing, null );
+  }
   public void surroundSelection( String leading, String trailing,
                                  final String hint ) {
     final StyleClassedTextArea textArea = getEditor();
     // Note: not using textArea.insertText() to insert leading and trailing
     // because this would add two changes to undo history
     final IndexRange selection = textArea.getSelection();
     int start = selection.getStart();
     int end = selection.getEnd();
     final String selectedText = textArea.getSelectedText();
     // remove leading and trailing whitespaces from selected text
     String trimmedSelectedText = selectedText.trim();
     if( trimmedSelectedText.length() < selectedText.length() ) {
       start += selectedText.indexOf( trimmedSelectedText );
       end = start + trimmedSelectedText.length();
+    }
     // remove leading whitespaces from leading text if selection starts at zero
     if( start == 0 ) {
       leading = ltrim( leading );
+    }
     // remove trailing whitespaces from trailing text if selection ends at
     // text end
     if( end == textArea.getLength() ) {
       trailing = rtrim( trailing );
+    }
     // remove leading line separators from leading text
     // if there are line separators before the selected text
     if( leading.startsWith( "\n" ) ) {
       for( int i = start - 1; i >= 0 && leading.startsWith( "\n" ); i-- ) {
         if( !"\n".equals( textArea.getText( i, i + 1 ) ) ) {
           break;
+        }
         leading = leading.substring( 1 );
+      }
+    }
     // remove trailing line separators from trailing or leading text
     // if there are line separators after the selected text
     final boolean trailingIsEmpty = trailing.isEmpty();
     String str = trailingIsEmpty ? leading : trailing;
     if( str.endsWith( "\n" ) ) {
       final int length = textArea.getLength();
       for( int i = end; i < length && str.endsWith( "\n" ); i++ ) {
         if( !"\n".equals( textArea.getText( i, i + 1 ) ) ) {
           break;
+        }
         str = str.substring( 0, str.length() - 1 );
+      }
       if( trailingIsEmpty ) {
         leading = str;
+      }
       else {
         trailing = str;
+      }
+    }
     int selStart = start + leading.length();
     int selEnd = end + leading.length();
     // insert hint text if selection is empty
     if( hint != null && trimmedSelectedText.isEmpty() ) {
       trimmedSelectedText = hint;
       selEnd = selStart + hint.length();
+    }
     // prevent undo merging with previous text entered by user
     getUndoManager().preventMerge();
     // replace text and update selection
     textArea.replaceText( start,
                           end,
                           leading + trimmedSelectedText + trailing );
     textArea.selectRange( selStart, selEnd );
+  }
   /**
    * Returns one of: selected text, word under cursor, or parsed hyperlink from
    * the markdown AST.
+   *
    * @return An instance containing the link URL and display text.
    */
   private HyperlinkModel getHyperlink() {
     final StyleClassedTextArea textArea = getEditor();
     final String selectedText = textArea.getSelectedText();
     // Get the current paragraph, convert to Markdown nodes.
     final MarkdownProcessor mp = new MarkdownProcessor( null );
     final int p = textArea.getCurrentParagraph();
     final String paragraph = textArea.getText( p );
     final Node node = mp.toNode( paragraph );
     final LinkVisitor visitor = new LinkVisitor( textArea.getCaretColumn() );
     final Link link = visitor.process( node );
     if( link != null ) {
       textArea.selectRange( p, link.getStartOffset(), p, link.getEndOffset() );
+    }
     return createHyperlinkModel(
         link, selectedText, "https://localhost"
     );
+  }
   @SuppressWarnings("SameParameterValue")
   private HyperlinkModel createHyperlinkModel(
       final Link link, final String selection, final String url ) {
     return link == null
         ? new HyperlinkModel( selection, url )
         : new HyperlinkModel( link );
+  }
   private Path getParentPath() {
     final Path path = getPath();
     return (path != null) ? path.getParent() : null;
+  }
   private Dialog<String> createLinkDialog() {
     return new LinkDialog( getWindow(), getHyperlink() );
+  }
   private Dialog<String> createImageDialog() {
     return new ImageDialog( getWindow(), getParentPath() );
+  }
   private void insertObject( final Dialog<String> dialog ) {
     dialog.showAndWait().ifPresent(
         result -> getEditor().replaceSelection( result )
     );
+  }
   public void insertLink() {
     insertObject( createLinkDialog() );
+  }
   public void insertImage() {
     insertObject( createImageDialog() );
+  }
   private Window getWindow() {
     return getScrollPane().getScene().getWindow();
+  }
+}

A src/main/java/com/scrivenvar/predicates/files/FileTypePredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.files;
 import java.io.File;
 import java.nio.file.FileSystems;
 import java.nio.file.PathMatcher;
 import java.util.Collection;
 import java.util.function.Predicate;
 /**
  * Responsible for testing whether a given path (to a file) matches one of the
  * filename extension patterns provided during construction.
+ *
  * @author White Magic Software, Ltd.
  */
 public class FileTypePredicate implements Predicate<File> {
   private final PathMatcher mMatcher;
   /**
    * Constructs a new instance given a set of file extension globs.
+   *
    * @param patterns Comma-separated list of globbed extensions including the
    * Kleene star (e.g., <code>*.md,*.markdown,*.txt</code>).
    */
   public FileTypePredicate( final String patterns ) {
     mMatcher = FileSystems.getDefault().getPathMatcher(
       "glob:**{" + patterns + "}"
     );
+  }
   /**
    * Constructs a new instance given a list of file extension globs, each must
    * include the Kleene star (a.k.a. asterisk).
+   *
    * @param patterns Collection of globbed extensions.
    */
   public FileTypePredicate( final Collection<String> patterns ) {
     this( String.join( ",", patterns ) );
+  }
   /**
    * Returns true if the file matches the patterns defined during construction.
+   *
    * @param file The filename to match against the given glob patterns.
+   *
    * @return false The filename does not match the glob patterns.
    */
   @Override
   public boolean test( final File file ) {
     return getMatcher().matches( file.toPath() );
+  }
   private PathMatcher getMatcher() {
     return mMatcher;
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/ContainsPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 /**
  * Determines if one string contains another.
+ *
  * @author White Magic Software, Ltd.
  */
 public class ContainsPredicate extends StringPredicate {
   /**
    * Calls the superclass to construct the instance.
+   *
    * @param comparate Not null.
    */
   public ContainsPredicate( final String comparate ) {
     super( comparate );
+  }
   /**
    * Answers whether the given strings match each other. What match means will
    * depend on user preferences. The empty condition is required to return the
    * first node in a list of child nodes when the user has not yet selected a
    * node.
+   *
    * @param comparator The string to compare against the comparate.
+   *
    * @return true if s1 and s2 are a match according to some criteria,or s2 is
    * empty.
    */
   @Override
   public boolean test( final String comparator ) {
     final String comparate = getComparate().toLowerCase();
     return comparator.contains( comparate.toLowerCase() )
       || comparate.isEmpty();
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/StartsPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 /**
  * Determines if a string starts with another.
+ *
  * @author White Magic Software, Ltd.
  */
 public class StartsPredicate extends StringPredicate {
   /**
    * Constructs a new instance using a comparate that will be compared with
    * the comparator during the test.
+   *
    * @param comparate The string to compare against the comparator.
    */
   public StartsPredicate( final String comparate ) {
     super( comparate );
+  }
   /**
    * Compares two strings.
+   *
    * @param comparator A non-null string, possibly empty.
+   *
    * @return true The comparator starts with the comparate, ignoring case.
    */
   @Override
   public boolean test( final String comparator ) {
     final String comparate = getComparate().toLowerCase();
     return comparator.startsWith( comparate.toLowerCase() );
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/StringPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 import java.util.function.Predicate;
 /**
  * General predicate for different types of string comparisons.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class StringPredicate implements Predicate<String> {
   private final String comparate;
   public StringPredicate( final String comparate ) {
     this.comparate = comparate;
+  }
   protected String getComparate() {
     return this.comparate;
+  }
+}

A src/main/java/com/scrivenvar/preferences/FilePreferences.java

 /*
  * Copyright 2016 David Croft and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preferences;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.events.Notifier;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.*;
 import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
 /**
  * Preferences implementation that stores to a user-defined file. Local file
  * storage is preferred over a certain operating system's monolithic trash heap
  * called a registry. When the OS is locked down, the default Preferences
  * implementation will try to write to the registry and fail due to permissions
  * problems. This class sidesteps the issue entirely by writing to the user's
  * home directory, where permissions should be a bit more lax.
  */
 public class FilePreferences extends AbstractPreferences {
   private final Notifier mNotifier = Services.load( Notifier.class );
   private final Map<String, String> mRoot = new TreeMap<>();
   private final Map<String, FilePreferences> mChildren = new TreeMap<>();
   private boolean mRemoved;
   private final Object mMutex = new Object();
   public FilePreferences(
       final AbstractPreferences parent, final String name ) {
     super( parent, name );
     try {
       sync();
     } catch( final BackingStoreException ex ) {
       error( ex );
+    }
+  }
   @Override
   protected void putSpi( final String key, final String value ) {
     mRoot.put( key, value );
     try {
       flush();
     } catch( final BackingStoreException ex ) {
       error( ex );
+    }
+  }
   @Override
   protected String getSpi( final String key ) {
     return mRoot.get( key );
+  }
   @Override
   protected void removeSpi( final String key ) {
     mRoot.remove( key );
     try {
       flush();
     } catch( final BackingStoreException ex ) {
       error( ex );
+    }
+  }
   @Override
   protected void removeNodeSpi() throws BackingStoreException {
     mRemoved = true;
     flush();
+  }
   @Override
   protected String[] keysSpi() {
     return mRoot.keySet().toArray( new String[ 0 ] );
+  }
   @Override
   protected String[] childrenNamesSpi() {
     return mChildren.keySet().toArray( new String[ 0 ] );
+  }
   @Override
   protected FilePreferences childSpi( final String name ) {
     FilePreferences child = mChildren.get( name );
     if( child == null || child.isRemoved() ) {
       child = new FilePreferences( this, name );
       mChildren.put( name, child );
+    }
     return child;
+  }
   @Override
   protected void syncSpi() {
     if( isRemoved() ) {
       return;
+    }
     final File file = FilePreferencesFactory.getPreferencesFile();
     if( !file.exists() ) {
       return;
+    }
     synchronized( mMutex ) {
       final Properties p = new Properties();
       try {
         p.load( new FileInputStream( file ) );
         final String path = getPath();
         final Enumeration<?> propertyNames = p.propertyNames();
         while( propertyNames.hasMoreElements() ) {
           final String propKey = (String) propertyNames.nextElement();
           if( propKey.startsWith( path ) ) {
             final String subKey = propKey.substring( path.length() );
             // Only load immediate descendants
             if( subKey.indexOf( '.' ) == -1 ) {
               mRoot.put( subKey, p.getProperty( propKey ) );
+            }
+          }
+        }
       } catch( final Exception ex ) {
         error( new BackingStoreException( ex ) );
+      }
+    }
+  }
   private String getPath() {
     final FilePreferences parent = (FilePreferences) parent();
     return parent == null ? "" : parent.getPath() + name() + '.';
+  }
   @Override
   protected void flushSpi() {
     final File file = FilePreferencesFactory.getPreferencesFile();
     synchronized( mMutex ) {
       final Properties p = new Properties();
       try {
         final String path = getPath();
         if( file.exists() ) {
           p.load( new FileInputStream( file ) );
           final List<String> toRemove = new ArrayList<>();
           // Make a list of all direct children of this node to be removed
           final Enumeration<?> propertyNames = p.propertyNames();
           while( propertyNames.hasMoreElements() ) {
             final String propKey = (String) propertyNames.nextElement();
             if( propKey.startsWith( path ) ) {
               final String subKey = propKey.substring( path.length() );
               // Only do immediate descendants
               if( subKey.indexOf( '.' ) == -1 ) {
                 toRemove.add( propKey );
+              }
+            }
+          }
           // Remove them now that the enumeration is done with
           for( final String propKey : toRemove ) {
             p.remove( propKey );
+          }
+        }
         // If this node hasn't been removed, add back in any values
         if( !mRemoved ) {
           for( final String s : mRoot.keySet() ) {
             p.setProperty( path + s, mRoot.get( s ) );
+          }
+        }
         p.store( new FileOutputStream( file ), "FilePreferences" );
       } catch( final Exception ex ) {
         error( new BackingStoreException( ex ) );
+      }
+    }
+  }
   private void error( final BackingStoreException ex ) {
     getNotifier().notify( ex );
+  }
   private Notifier getNotifier() {
     return mNotifier;
+  }
+}

A src/main/java/com/scrivenvar/preferences/FilePreferencesFactory.java

 /*
  * Copyright 2016 David Croft and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preferences;
 import java.io.File;
 import java.nio.file.FileSystems;
 import java.util.prefs.Preferences;
 import java.util.prefs.PreferencesFactory;
 import static com.scrivenvar.Constants.APP_TITLE;
 /**
  * PreferencesFactory implementation that stores the preferences in a
  * user-defined file. Usage:
  * <pre>
  * System.setProperty( "java.util.prefs.PreferencesFactory",
  * FilePreferencesFactory.class.getName() );
  * </pre>
  * <p>
  * The file defaults to <code>$user.home/.scrivenvar</code>, but can be changed
  * using <code>-Dapplication.name=preferences</code> when running the
  * application, or by calling <code>System.setProperty</code> with the
  * "application.name" property.
  * </p>
  */
 public class FilePreferencesFactory implements PreferencesFactory {
   private static File preferencesFile;
   private Preferences rootPreferences;
   @Override
   public Preferences systemRoot() {
     return userRoot();
+  }
   @Override
   public synchronized Preferences userRoot() {
     if( rootPreferences == null ) {
       rootPreferences = new FilePreferences( null, "" );
+    }
     return rootPreferences;
+  }
   public synchronized static File getPreferencesFile() {
     if( preferencesFile == null ) {
       String prefsFile = getPreferencesFilename();
       preferencesFile = new File( prefsFile ).getAbsoluteFile();
+    }
     return preferencesFile;
+  }
   public static String getPreferencesFilename() {
     final String filename = System.getProperty( "application.name", APP_TITLE );
     return System.getProperty( "user.home" ) + getSeparator() + "." + filename;
+  }
   public static String getSeparator() {
     return FileSystems.getDefault().getSeparator();
+  }
+}

A src/main/java/com/scrivenvar/preferences/UserPreferences.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preferences;
 import com.dlsc.formsfx.model.structure.StringField;
 import com.dlsc.preferencesfx.PreferencesFx;
 import com.dlsc.preferencesfx.model.Category;
 import com.dlsc.preferencesfx.model.Group;
 import com.dlsc.preferencesfx.model.Setting;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.Settings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import java.io.File;
 import java.nio.file.Path;
 import static com.scrivenvar.Constants.PERSIST_IMAGES_DEFAULT;
 import static com.scrivenvar.Constants.USER_DIRECTORY;
 import static com.scrivenvar.Messages.get;
 public class UserPreferences {
   private final Settings SETTINGS = Services.load( Settings.class );
   private final ObjectProperty<File> mPropRDirectory;
   private final StringProperty mPropRScript;
   private final ObjectProperty<File> mPropImagesDirectory;
   private final StringProperty mPropImagesOrder;
   private final ObjectProperty<File> mPropDefinitionPath;
   private final PreferencesFx mPreferencesFx;
   public UserPreferences() {
     mPropRDirectory = simpleFile( USER_DIRECTORY );
     mPropRScript = new SimpleStringProperty( "" );
     mPropImagesDirectory = simpleFile( USER_DIRECTORY );
     mPropImagesOrder = new SimpleStringProperty( PERSIST_IMAGES_DEFAULT );
     mPropDefinitionPath = simpleFile( getSetting(
         "file.definition.default", "variables.yaml" )
     );
     mPreferencesFx = createPreferencesFx();
+  }
   /**
    * Display the user preferences settings dialog (non-modal).
    */
   public void show() {
     mPreferencesFx.show( false );
+  }
   /**
    * Call to persist the settings. Strictly speaking, this could watch on
    * all values for external changes then save automatically.
    */
   public void save() {
     mPreferencesFx.saveSettings();
+  }
   /**
    * Creates the preferences dialog.
    * <p>
    * TODO: Make this dynamic by iterating over all "Preferences.*" values
    * that follow a particular naming pattern.
    * </p>
+   *
    * @return A new instance of preferences for users to edit.
    */
   @SuppressWarnings("unchecked")
   private PreferencesFx createPreferencesFx() {
     final Setting<StringField, StringProperty> scriptSetting =
         Setting.of( "Script", mPropRScript );
     final StringField field = scriptSetting.getElement();
     field.multiline( true );
     return PreferencesFx.of(
         UserPreferences.class,
         Category.of(
             get( "Preferences.r" ),
             Group.of(
                 get( "Preferences.r.directory" ),
                 Setting.of( label( "Preferences.r.directory.desc", false ) ),
                 Setting.of( "Directory", mPropRDirectory, true )
             ),
             Group.of(
                 get( "Preferences.r.script" ),
                 Setting.of( label( "Preferences.r.script.desc" ) ),
                 scriptSetting
+            )
         ),
         Category.of(
             get( "Preferences.images" ),
             Group.of(
                 get( "Preferences.images.directory" ),
                 Setting.of( label( "Preferences.images.directory.desc" ) ),
                 Setting.of( "Directory", mPropImagesDirectory, true )
             ),
             Group.of(
                 get( "Preferences.images.suffixes" ),
                 Setting.of( label( "Preferences.images.suffixes.desc" ) ),
                 Setting.of( "Extensions", mPropImagesOrder )
+            )
         ),
         Category.of(
             get( "Preferences.definitions" ),
             Group.of(
                 get( "Preferences.definitions.path" ),
                 Setting.of( label( "Preferences.definitions.path.desc" ) ),
                 Setting.of( "Path", mPropDefinitionPath, false )
+            )
+        )
     );
+  }
   /**
    * Wraps a {@link File} inside a {@link SimpleObjectProperty}.
+   *
    * @param path The file name to use when constructing the {@link File}.
    * @return A new {@link SimpleObjectProperty} instance with a {@link File}
    * that references the given {@code path}.
    */
   private SimpleObjectProperty<File> simpleFile( final String path ) {
     return new SimpleObjectProperty<>( new File( path ) );
+  }
   /**
    * Creates a label for the given key after interpolating its value.
+   *
    * @param key The key to find in the resource bundle.
    * @return The value of the key as a label.
    */
   private Node label( final String key ) {
     return new Label( get( key, true ) );
+  }
   /**
    * Creates a label for the given key.
+   *
    * @param key         The key to find in the resource bundle.
    * @param interpolate {@code true} means to interpolate the value.
    * @return The value of the key, interpolated if {@code interpolate} is
    * {@code true}.
    */
   @SuppressWarnings("SameParameterValue")
   private Node label( final String key, final boolean interpolate ) {
     return new Label( get( key, interpolate ) );
+  }
   /**
    * Returns the value for a key from the settings properties file.
+   *
    * @param key   Key within the settings properties file to find.
    * @param value Default value to return if the key is not found.
    * @return The value for the given key from the settings file, or the
    * given {@code value} if no key found.
    */
   @SuppressWarnings("SameParameterValue")
   private String getSetting( final String key, final String value ) {
     return SETTINGS.getSetting( key, value );
+  }
   public ObjectProperty<File> definitionPathProperty() {
     return mPropDefinitionPath;
+  }
   public Path getDefinitionPath() {
     return definitionPathProperty().getValue().toPath();
+  }
   private ObjectProperty<File> rDirectoryProperty() {
     return mPropRDirectory;
+  }
   public File getRDirectory() {
     return rDirectoryProperty().getValue();
+  }
   private StringProperty rScriptProperty() {
     return mPropRScript;
+  }
   public String getRScript() {
     return rScriptProperty().getValue();
+  }
   private ObjectProperty<File> imagesDirectoryProperty() {
     return mPropImagesDirectory;
+  }
   public File getImagesDirectory() {
     return imagesDirectoryProperty().getValue();
+  }
   private StringProperty imagesOrderProperty() {
     return mPropImagesOrder;
+  }
   public String getImagesOrder() {
     return imagesOrderProperty().getValue();
+  }
+}

A src/main/java/com/scrivenvar/preview/ChainedReplacedElementFactory.java

 /*
  * {{{ header & license
  * Copyright (c) 2006 Patrick Wright
  * Copyright (c) 2007 Wisconsin Court System
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; either version 2.1
  * of the License, or (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
  * GNU Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * }}}
  */
 package com.scrivenvar.preview;
 import org.w3c.dom.Element;
 import org.xhtmlrenderer.extend.ReplacedElement;
 import org.xhtmlrenderer.extend.ReplacedElementFactory;
 import org.xhtmlrenderer.extend.UserAgentCallback;
 import org.xhtmlrenderer.layout.LayoutContext;
 import org.xhtmlrenderer.render.BlockBox;
 import org.xhtmlrenderer.simple.extend.FormSubmissionListener;
 import java.util.ArrayList;
 import java.util.List;
 public class ChainedReplacedElementFactory implements ReplacedElementFactory {
   private final List<ReplacedElementFactory> mFactoryList = new ArrayList<>();
   public ChainedReplacedElementFactory() {
+  }
   public ReplacedElement createReplacedElement(
       LayoutContext c, BlockBox box, UserAgentCallback uac,
       int cssWidth, int cssHeight ) {
     ReplacedElement re = null;
     for( final ReplacedElementFactory ref : mFactoryList ) {
       re = ref.createReplacedElement( c, box, uac, cssWidth, cssHeight );
       if( re != null ) {
         break;
+      }
+    }
     return re;
+  }
   public void addFactory( final ReplacedElementFactory factory ) {
     mFactoryList.add( factory );
+  }
   public void reset() {
     for( final ReplacedElementFactory factory : mFactoryList ) {
       factory.reset();
+    }
+  }
   public void remove( final Element element ) {
     for( final ReplacedElementFactory factory : mFactoryList ) {
       factory.remove( element );
+    }
+  }
   public void setFormSubmissionListener( FormSubmissionListener listener ) {
+  }
+}

A src/main/java/com/scrivenvar/preview/HTMLPreviewPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preview;
 import javafx.embed.swing.SwingNode;
 import javafx.scene.Node;
 import javafx.scene.layout.Pane;
 import org.jsoup.Jsoup;
 import org.jsoup.helper.W3CDom;
 import org.jsoup.nodes.Document;
 import org.xhtmlrenderer.simple.XHTMLPanel;
 import org.xhtmlrenderer.simple.extend.XhtmlNamespaceHandler;
 import org.xhtmlrenderer.swing.SwingReplacedElementFactory;
 import javax.swing.*;
 import java.nio.file.Path;
 import static com.scrivenvar.Constants.STYLESHEET_PREVIEW;
 /**
  * HTML preview pane is responsible for rendering an HTML document.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class HTMLPreviewPane extends Pane {
   private static class HTMLPanel extends XHTMLPanel {
     /**
      * Prevent scrolling to the top.
      */
     @Override
     public void resetScrollPosition() {
+    }
+  }
   private final static String HTML_HEADER = "<!DOCTYPE html>"
       + "<html>"
       + "<head>"
       + "<link rel='stylesheet' href='" +
       HTMLPreviewPane.class.getResource( STYLESHEET_PREVIEW ) + "'/>"
       + "</head>"
       + "<body>";
   private final static String HTML_FOOTER = "</body></html>";
   private final StringBuilder mHtml = new StringBuilder( 65536 );
   private final int mHtmlPrefixLength;
   private final W3CDom mW3cDom = new W3CDom();
   private final XhtmlNamespaceHandler mNamespaceHandler =
       new XhtmlNamespaceHandler();
   private final HTMLPanel mRenderer = new HTMLPanel();
   private final SwingNode mSwingNode = new SwingNode();
   private final JScrollPane mScrollPane = new JScrollPane( mRenderer );
   private Path mPath;
   /**
    * Creates a new preview pane that can scroll to the caret position within the
    * document.
    */
   public HTMLPreviewPane() {
     final ChainedReplacedElementFactory factory =
         new ChainedReplacedElementFactory();
     factory.addFactory( new SVGReplacedElementFactory() );
     factory.addFactory( new SwingReplacedElementFactory() );
     mRenderer.getSharedContext().setReplacedElementFactory( factory );
     mRenderer.getSharedContext().getTextRenderer().setSmoothingThreshold( 0 );
     mSwingNode.setContent( mScrollPane );
     mHtml.append( HTML_HEADER );
     mHtmlPrefixLength = mHtml.length();
+  }
   /**
    * Updates the internal HTML source, loads it into the preview pane, then
    * scrolls to the caret position.
+   *
    * @param html The new HTML document to display.
    */
   public void update( final String html ) {
     final Document jsoupDoc = Jsoup.parse( decorate( html ) );
     org.w3c.dom.Document w3cDoc = mW3cDom.fromJsoup( jsoupDoc );
     mRenderer.setDocument( w3cDoc, getBaseUrl(), mNamespaceHandler );
+  }
   private String decorate( final String html ) {
     mHtml.setLength( mHtmlPrefixLength );
     return mHtml.append( html )
                 .append( HTML_FOOTER )
                 .toString();
+  }
   /**
    * Clears out the HTML content from the preview.
    */
   public void clear() {
     update( "" );
+  }
   private String getBaseUrl() {
     final Path basePath = getPath();
     final Path parent = basePath == null ? null : basePath.getParent();
     return parent == null ? "" : parent.toUri().toString();
+  }
   public Path getPath() {
     return mPath;
+  }
   public void setPath( final Path path ) {
     assert path != null;
     mPath = path;
+  }
   /**
    * Content to embed in a panel.
+   *
    * @return The content to display to the user.
    */
   public Node getNode() {
     return mSwingNode;
+  }
   public JScrollPane getScrollPane() {
     return mScrollPane;
+  }
   public JScrollBar getVerticalScrollBar() {
     return getScrollPane().getVerticalScrollBar();
+  }
+}

A src/main/java/com/scrivenvar/preview/SVGRasterizer.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preview;
 import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 import org.apache.batik.gvt.renderer.ImageRenderer;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.ImageTranscoder;
 import org.w3c.dom.svg.SVGDocument;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 import static java.awt.Color.WHITE;
 import static java.awt.RenderingHints.*;
 import static org.apache.batik.transcoder.SVGAbstractTranscoder.KEY_WIDTH;
 import static org.apache.batik.transcoder.image.ImageTranscoder.KEY_BACKGROUND_COLOR;
 import static org.apache.batik.util.XMLResourceDescriptor.getXMLParserClassName;
 public class SVGRasterizer {
   private final static SAXSVGDocumentFactory mFactory =
       new SAXSVGDocumentFactory( getXMLParserClassName() );
   private final static Map<Object, Object> RENDERING_HINTS = Map.of(
       KEY_ALPHA_INTERPOLATION,
       VALUE_ALPHA_INTERPOLATION_QUALITY,
       KEY_INTERPOLATION,
       VALUE_INTERPOLATION_BICUBIC,
       KEY_ANTIALIASING,
       VALUE_ANTIALIAS_ON,
       KEY_COLOR_RENDERING,
       VALUE_COLOR_RENDER_QUALITY,
       KEY_DITHERING,
       VALUE_DITHER_DISABLE,
       KEY_RENDERING,
       VALUE_RENDER_QUALITY,
       KEY_STROKE_CONTROL,
       VALUE_STROKE_PURE,
       KEY_FRACTIONALMETRICS,
       VALUE_FRACTIONALMETRICS_ON,
       KEY_TEXT_ANTIALIASING,
       VALUE_TEXT_ANTIALIAS_OFF
   );
   private static class BufferedImageTranscoder extends ImageTranscoder {
     private BufferedImage mImage;
     @Override
     public BufferedImage createImage( final int w, final int h ) {
       return new BufferedImage( w, h, BufferedImage.TYPE_INT_ARGB );
+    }
     @Override
     public void writeImage(
         final BufferedImage image, final TranscoderOutput output ) {
       mImage = image;
+    }
     public BufferedImage getBufferedImage() {
       return mImage;
+    }
     @Override
     protected ImageRenderer createRenderer() {
       final ImageRenderer renderer = super.createRenderer();
       final RenderingHints hints = renderer.getRenderingHints();
       hints.putAll( RENDERING_HINTS );
       renderer.setRenderingHints( hints );
       return renderer;
+    }
+  }
   public static BufferedImage rasterize( final String url, final int width )
       throws IOException, TranscoderException {
     return rasterize( new URL( url ), width );
+  }
   public static BufferedImage rasterize( final URL url, final int width )
       throws IOException, TranscoderException {
     return rasterize(
         (SVGDocument) mFactory.createDocument( url.toString() ), width );
+  }
   public static BufferedImage rasterize(
       final SVGDocument svg, final int width ) throws TranscoderException {
     final var transcoder = new BufferedImageTranscoder();
     final var input = new TranscoderInput( svg );
     transcoder.addTranscodingHint( KEY_BACKGROUND_COLOR, WHITE );
     transcoder.addTranscodingHint( KEY_WIDTH, (float) width );
     transcoder.transcode( input, null );
     return transcoder.getBufferedImage();
+  }
+}

A src/main/java/com/scrivenvar/preview/SVGReplacedElementFactory.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preview;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.events.Notifier;
 import org.apache.commons.io.FilenameUtils;
 import org.w3c.dom.Element;
 import org.xhtmlrenderer.extend.ReplacedElement;
 import org.xhtmlrenderer.extend.ReplacedElementFactory;
 import org.xhtmlrenderer.extend.UserAgentCallback;
 import org.xhtmlrenderer.layout.LayoutContext;
 import org.xhtmlrenderer.render.BlockBox;
 import org.xhtmlrenderer.simple.extend.FormSubmissionListener;
 import org.xhtmlrenderer.swing.ImageReplacedElement;
 import java.awt.*;
 public class SVGReplacedElementFactory
     implements ReplacedElementFactory {
   private final static Notifier sNotifier = Services.load( Notifier.class );
   /**
    * SVG filename extension.
    */
   private static final String SVG_FILE = "svg";
   private static final String HTML_IMAGE = "img";
   private static final String HTML_IMAGE_SRC = "src";
   public ReplacedElement createReplacedElement(
       final LayoutContext c, final BlockBox box, final UserAgentCallback uac,
       final int cssWidth, final int cssHeight ) {
     final Element e = box.getElement();
     if( e == null ) {
       return null;
+    }
     final String nodeName = e.getNodeName();
     ReplacedElement result = null;
     if( HTML_IMAGE.equals( nodeName ) ) {
       final String src = e.getAttribute( HTML_IMAGE_SRC );
       final String ext = FilenameUtils.getExtension( src );
       if( SVG_FILE.equalsIgnoreCase( ext ) ) {
         try {
           final int width = box.getContentWidth();
           final Image image = SVGRasterizer.rasterize( src, width );
           final int w = image.getWidth( null );
           final int h = image.getHeight( null );
           result = new ImageReplacedElement( image, w, h );
         } catch( final Exception ex ) {
           getNotifier().notify( ex );
+        }
+      }
+    }
     return result;
+  }
   @Override
   public void reset() {
+  }
   @Override
   public void remove( Element e ) {
+  }
   @Override
   public void setFormSubmissionListener( FormSubmissionListener listener ) {
+  }
   private Notifier getNotifier() {
     return sNotifier;
+  }
+}

A src/main/java/com/scrivenvar/processors/AbstractProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 /**
  * Responsible for transforming a document through a variety of chained
  * handlers. If there are conditions where this handler should not process the
  * entire chain, create a second handler, or split the chain into reusable
  * sub-chains.
+ *
  * @author White Magic Software, Ltd.
  * @param <T> The type of object to process.
  */
 public abstract class AbstractProcessor<T> implements Processor<T> {
   /**
    * Used while processing the entire chain; null to signify no more links.
    */
   private final Processor<T> mNext;
   /**
    * Constructs a succession without a successor (i.e., next is null).
    */
   protected AbstractProcessor() {
     this( null );
+  }
   /**
    * Constructs a new default handler with a given successor.
+   *
    * @param successor Use null to indicate last link in the chain.
    */
   public AbstractProcessor( final Processor<T> successor ) {
     mNext = successor;
+  }
   /**
    * Processes links in the chain while there are successors and valid data to
    * process.
+   *
    * @param t The object to process.
    */
   @Override
   public synchronized void processChain( T t ) {
     Processor<T> handler = this;
     while( handler != null && t != null ) {
       t = handler.processLink( t );
       handler = handler.next();
+    }
+  }
   @Override
   public Processor<T> next() {
     return mNext;
+  }
+}

A src/main/java/com/scrivenvar/processors/DefinitionProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import java.util.Map;
 import static com.scrivenvar.processors.text.TextReplacementFactory.replace;
 /**
  * Processes interpolated string definitions in the document and inserts
  * their values into the post-processed text. The default variable syntax is
  * {@code $variable$}.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefinitionProcessor extends AbstractProcessor<String> {
   private final Map<String, String> mDefinitions;
   public DefinitionProcessor(
       final Processor<String> successor, final Map<String, String> map ) {
     super( successor );
     mDefinitions = map;
+  }
   /**
    * Processes the given text document by replacing variables with their values.
+   *
    * @param text The document text that includes variables that should be
    *             replaced with values when rendered as HTML.
    * @return The text with all variables replaced.
    */
   @Override
   public String processLink( final String text ) {
     return replace( text, getDefinitions() );
+  }
   /**
    * Returns the map to use for variable substitution.
+   *
    * @return A map of variable names to values.
    */
   protected Map<String, String> getDefinitions() {
     return mDefinitions;
+  }
+}

A src/main/java/com/scrivenvar/processors/HTMLPreviewProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.scrivenvar.preview.HTMLPreviewPane;
 /**
  * Responsible for notifying the HTMLPreviewPane when the succession chain has
  * updated. This decouples knowledge of changes to the editor panel from the
  * HTML preview panel as well as any processing that takes place before the
  * final HTML preview is rendered. This should be the last link in the processor
  * chain.
+ *
  * @author White Magic Software, Ltd.
  */
 public class HTMLPreviewProcessor extends AbstractProcessor<String> {
   // There is only one preview panel.
   private static HTMLPreviewPane sHtmlPreviewPane;
   /**
    * Constructs the end of a processing chain.
+   *
    * @param htmlPreviewPane The pane to update with the post-processed document.
    */
   public HTMLPreviewProcessor( final HTMLPreviewPane htmlPreviewPane ) {
     sHtmlPreviewPane = htmlPreviewPane;
+  }
   /**
    * Update the preview panel using HTML from the succession chain.
+   *
    * @param html The document content to render in the preview pane. The HTML
    * should not contain a doctype, head, or body tag, only content to render
    * within the body.
+   *
    * @return null
    */
   @Override
   public String processLink( final String html ) {
     getHtmlPreviewPane().update( html );
     // No more processing required.
     return null;
+  }
   private HTMLPreviewPane getHtmlPreviewPane() {
     return sHtmlPreviewPane;
+  }
+}

A src/main/java/com/scrivenvar/processors/IdentityProcessor.java

 /*
  * Copyright 2017 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 /**
  * This is the default processor used when an unknown filename extension is
  * encountered.
+ *
  * @author White Magic Software, Ltd.
  */
 public class IdentityProcessor extends AbstractProcessor<String> {
   /**
    * Passes the link to the super constructor.
+   *
    * @param link The next processor in the chain to use for text processing.
    */
   public IdentityProcessor( final Processor<String> link ) {
     super( link );
+  }
   /**
    * Returns the given string, modified with "pre" tags.
+   *
    * @param t The string to return, enclosed in "pre" tags.
    * @return The value of t wrapped in "pre" tags.
    */
   @Override
   public String processLink( final String t ) {
     return "<pre>" + t + "</pre>";
+  }
+}

A src/main/java/com/scrivenvar/processors/InlineRProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.scrivenvar.Services;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.events.Notifier;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import static com.scrivenvar.Constants.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.decorators.RVariableDecorator.PREFIX;
 import static com.scrivenvar.decorators.RVariableDecorator.SUFFIX;
 import static com.scrivenvar.processors.text.TextReplacementFactory.replace;
 import static java.lang.Math.min;
 /**
  * Transforms a document containing R statements into Markdown.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class InlineRProcessor extends DefinitionProcessor {
   private static final Notifier NOTIFIER = Services.load( Notifier.class );
   private static final Options OPTIONS = Services.load( Options.class );
   /**
    * Constrain memory when typing new R expressions into the document.
    */
   private static final int MAX_CACHED_R_STATEMENTS = 512;
   /**
    * Only one editor is open at a time.
    */
   private static final ScriptEngine ENGINE =
       (new ScriptEngineManager()).getEngineByName( "Renjin" );
   /**
    * Where to put document inline evaluated R expressions.
    */
   private final Map<String, Object> mEvalCache = new LinkedHashMap<>() {
     @Override
     protected boolean removeEldestEntry(
         final Map.Entry<String, Object> eldest ) {
       return size() > MAX_CACHED_R_STATEMENTS;
+    }
   };
   /**
    * Constructs a processor capable of evaluating R statements.
+   *
    * @param processor Subsequent link in the processing chain.
    * @param map       Resolved definitions map.
    */
   public InlineRProcessor(
       final Processor<String> processor,
       final Map<String, String> map ) {
     super( processor, map );
     init();
+  }
   /**
    * Initialises the R code so that R can find imported libraries.
    */
   private void init() {
     try {
       final Path wd = getWorkingDirectory();
       final String dir = wd.toString().replace( '\\', '/' );
       final Map<String, String> map = getDefinitions();
       map.put( "$application.r.working.directory$", dir );
       final String bootstrap = getBootstrapScript();
       if( !bootstrap.isBlank() ) {
         eval( replace( bootstrap, map ) );
+      }
     } catch( final Exception e ) {
       getNotifier().notify( e );
+    }
+  }
   /**
    * Evaluates all R statements in the source document and inserts the
    * calculated value into the generated document.
+   *
    * @param text The document text that includes variables that should be
    *             replaced with values when rendered as HTML.
    * @return The generated document with output from all R statements
    * substituted with value returned from their execution.
    */
   @Override
   public String processLink( final String text ) {
     final int length = text.length();
     final int prefixLength = PREFIX.length();
     // The * 2 is a wild guess at the ratio of R statements to the length
     // of text produced by those statements.
     final StringBuilder sb = new StringBuilder( length * 2 );
     int prevIndex = 0;
     int currIndex = text.indexOf( PREFIX );
     while( currIndex >= 0 ) {
       // Copy everything up to, but not including, an R statement (`r#).
       sb.append( text, prevIndex, currIndex );
       // Jump to the start of the R statement.
       prevIndex = currIndex + prefixLength;
       // Find the statement ending (`), without indexing past the text boundary.
       currIndex = text.indexOf( SUFFIX, min( currIndex + 1, length ) );
       // Only evaluate inline R statements that have end delimiters.
       if( currIndex > 1 ) {
         // Extract the inline R statement to be evaluated.
         final String r = text.substring( prevIndex, currIndex );
         // Pass the R statement into the R engine for evaluation.
         try {
           final Object result = evalText( r );
           // Append the string representation of the result into the text.
           sb.append( result );
         } catch( final Exception e ) {
           // If the string couldn't be parsed using R, append the statement
           // that failed to parse, instead of its evaluated value.
           sb.append( PREFIX ).append( r ).append( SUFFIX );
           // Tell the user that there was a problem.
           getNotifier().notify(
               get( STATUS_PARSE_ERROR, e.getMessage(), currIndex )
           );
+        }
         // Retain the R statement's ending position in the text.
         prevIndex = currIndex + 1;
+      }
       // Find the start of the next inline R statement.
       currIndex = text.indexOf( PREFIX, min( currIndex + 1, length ) );
+    }
     // Copy from the previous index to the end of the string.
     return sb.append( text.substring( min( prevIndex, length ) ) ).toString();
+  }
   /**
    * Look up an R expression from the cache then return the resulting object.
    * If the R expression hasn't been cached, it'll first be evalulated.
+   *
    * @param r The expression to evaluate.
    * @return The object resulting from the evaluation.
    */
   private Object evalText( final String r ) {
     return mEvalCache.computeIfAbsent( r, v -> eval( r ) );
+  }
   /**
    * Evaluate an R expression and return the resulting object.
+   *
    * @param r The expression to evaluate.
    * @return The object resulting from the evaluation.
    */
   private Object eval( final String r ) {
     try {
       return getScriptEngine().eval( r );
     } catch( final ScriptException e ) {
       getNotifier().notify( e );
       return "";
+    }
+  }
   /**
    * This will return the given path if not null, otherwise it will return
    * the path to the user's directory.
+   *
    * @return A non-null path.
    */
   private Path getWorkingDirectory() {
     return getUserPreferences().getRDirectory().toPath();
+  }
   /**
    * Loads the R init script from the application's persisted preferences.
+   *
    * @return A non-null String, possibly empty.
    */
   private String getBootstrapScript() {
     return getUserPreferences().getRScript();
+  }
   private UserPreferences getUserPreferences() {
     return getOptions().getUserPreferences();
+  }
   private ScriptEngine getScriptEngine() {
     return ENGINE;
+  }
   private Notifier getNotifier() {
     return NOTIFIER;
+  }
   private Options getOptions() {
     return OPTIONS;
+  }
+}

A src/main/java/com/scrivenvar/processors/Processor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 /**
  * Responsible for processing documents from one known format to another.
+ *
  * @param <T> The type of processor to create.
  * @author White Magic Software, Ltd.
  */
 public interface Processor<T> {
   /**
    * Provided so that the chain can be invoked from any link using a given
    * value. This should be called automatically by a superclass so that
    * the links in the chain need only implement the processLink method.
+   *
    * @param t The value to pass along to each link in the chain.
    */
   void processChain( T t );
   /**
    * Processes the given content providing a transformation from one document
    * format into another. For example, this could convert from XML to text using
    * an XSLT processor, or from markdown to HTML.
+   *
    * @param t The type of object to process.
    * @return The post-processed document, or null if processing should stop.
    */
   T processLink( T t );
   /**
    * Adds a document processor to call after this processor finishes processing
    * the document given to the process method.
+   *
    * @return The processor that should transform the document after this
    * instance has finished processing.
    */
   Processor<T> next();
+}

A src/main/java/com/scrivenvar/processors/ProcessorFactory.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.scrivenvar.AbstractFileFactory;
 import com.scrivenvar.FileEditorTab;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import com.scrivenvar.processors.markdown.MarkdownProcessor;
 import java.nio.file.Path;
 import java.util.Map;
 /**
  * Responsible for creating processors capable of parsing, transforming,
  * interpolating, and rendering known file types.
+ *
  * @author White Magic Software, Ltd.
  */
 public class ProcessorFactory extends AbstractFileFactory {
   private final HTMLPreviewPane mPreviewPane;
   private final Map<String, String> mResolvedMap;
   private final Processor<String> mMarkdownProcessor;
   /**
    * Constructs a factory with the ability to create processors that can perform
    * text and caret processing to generate a final preview.
+   *
    * @param previewPane Where the final output is rendered.
    * @param resolvedMap Flat map of definitions to replace before final render.
    */
   public ProcessorFactory(
       final HTMLPreviewPane previewPane,
       final Map<String, String> resolvedMap ) {
     mPreviewPane = previewPane;
     mResolvedMap = resolvedMap;
     mMarkdownProcessor = createMarkdownProcessor();
+  }
   /**
    * Creates a processor suitable for parsing and rendering the file opened at
    * the given tab.
+   *
    * @param tab The tab containing a text editor, path, and caret position.
    * @return A processor that can render the given tab's text.
    */
   public Processor<String> createProcessor( final FileEditorTab tab ) {
     final Path path = tab.getPath();
     final Processor<String> processor;
     switch( lookup( path ) ) {
       case RMARKDOWN:
         processor = createRProcessor();
         break;
       case SOURCE:
         processor = createMarkdownDefinitionProcessor();
         break;
       case XML:
         processor = createXMLProcessor( tab );
         break;
       case RXML:
         processor = createRXMLProcessor( tab );
         break;
       default:
         processor = createIdentityProcessor();
         break;
+    }
     return processor;
+  }
   private Processor<String> createHTMLPreviewProcessor() {
     return new HTMLPreviewProcessor( getPreviewPane() );
+  }
   /**
    * Creates and links the processors at the end of the processing chain.
+   *
    * @return A markdown, caret replacement, and preview pane processor chain.
    */
   private Processor<String> createMarkdownProcessor() {
     final var hpp = createHTMLPreviewProcessor();
     return new MarkdownProcessor( hpp, getPreviewPane().getPath() );
+  }
   protected Processor<String> createIdentityProcessor() {
     final var hpp = createHTMLPreviewProcessor();
     return new IdentityProcessor( hpp );
+  }
   protected Processor<String> createDefinitionProcessor(
       final Processor<String> p ) {
     return new DefinitionProcessor( p, getResolvedMap() );
+  }
   protected Processor<String> createMarkdownDefinitionProcessor() {
     final var tpc = getCommonProcessor();
     return createDefinitionProcessor( tpc );
+  }
   protected Processor<String> createXMLProcessor( final FileEditorTab tab ) {
     final var tpc = getCommonProcessor();
     final var xmlp = new XMLProcessor( tpc, tab.getPath() );
     return createDefinitionProcessor( xmlp );
+  }
   protected Processor<String> createRProcessor() {
     final var tpc = getCommonProcessor();
     final var rp = new InlineRProcessor( tpc, getResolvedMap() );
     return new RVariableProcessor( rp, getResolvedMap() );
+  }
   protected Processor<String> createRXMLProcessor( final FileEditorTab tab ) {
     final var tpc = getCommonProcessor();
     final var xmlp = new XMLProcessor( tpc, tab.getPath() );
     final var rp = new InlineRProcessor( xmlp, getResolvedMap() );
     return new RVariableProcessor( rp, getResolvedMap() );
+  }
   private HTMLPreviewPane getPreviewPane() {
     return mPreviewPane;
+  }
   /**
    * Returns the variable map of interpolated definitions.
+   *
    * @return A map to help dereference variables.
    */
   private Map<String, String> getResolvedMap() {
     return mResolvedMap;
+  }
   /**
    * Returns a processor common to all processors: markdown, caret position
    * token replacer, and an HTML preview renderer.
+   *
    * @return Processors at the end of the processing chain.
    */
   private Processor<String> getCommonProcessor() {
     return mMarkdownProcessor;
+  }
+}

A src/main/java/com/scrivenvar/processors/RVariableProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import java.util.HashMap;
 import java.util.Map;
 /**
  * Converts the keys of the resolved map from default form to R form, then
  * performs a substitution on the text. The default R variable syntax is
  * {@code v$tree$leaf}.
+ *
  * @author White Magic Software, Ltd.
  */
 public class RVariableProcessor extends DefinitionProcessor {
   public RVariableProcessor(
       final Processor<String> rp, final Map<String, String> map ) {
     super( rp, map );
+  }
   /**
    * Returns the R-based version of the interpolated variable definitions.
+   *
    * @return Variable names transmogrified from the default syntax to R syntax.
    */
   @Override
   protected Map<String, String> getDefinitions() {
     return toR( super.getDefinitions() );
+  }
   /**
    * Converts the given map from regular variables to R variables.
+   *
    * @param map Map of variable names to values.
    * @return Map of R variables.
    */
   private Map<String, String> toR( final Map<String, String> map ) {
     final Map<String, String> rMap = new HashMap<>( map.size() );
     for( final String key : map.keySet() ) {
       rMap.put( toRKey( key ), toRValue( map.get( key ) ) );
+    }
     return rMap;
+  }
   /**
    * Transforms a variable name from $tree.branch.leaf$ to v$tree$branch$leaf
    * form.
+   *
    * @param key The variable name to transform, can be empty but not null.
    * @return The transformed variable name.
    */
   private String toRKey( final String key ) {
     // Replace all the periods with dollar symbols.
     final StringBuilder sb = new StringBuilder( 'v' + key );
     final int length = sb.length();
     // Replace all periods with dollar symbols. Normally we'd check i >= 0,
     // but the prepended 'v' is always going to be a 'v', not a dot.
     for( int i = length - 1; i > 0; i-- ) {
       if( sb.charAt( i ) == '.' ) {
         sb.setCharAt( i, '$' );
+      }
+    }
     // The length is always at least 1 (the 'v'), so bounds aren't broken here.
     sb.setLength( length - 1 );
     return sb.toString();
+  }
   private String toRValue( final String value ) {
     return '\'' + escape( value, '\'', "\\'" ) + '\'';
+  }
   /**
    * TODO: Make generic method for replacing text.
+   *
    * @param haystack Search this string for the needle, must not be null.
    * @param needle   The character to find in the haystack.
    * @param thread   Replace the needle with this text, if the needle is found.
    * @return The haystack with the all instances of needle replaced with thread.
    */
   @SuppressWarnings("SameParameterValue")
   private String escape(
       final String haystack, final char needle, final String thread ) {
     int end = haystack.indexOf( needle );
     if( end < 0 ) {
       return haystack;
+    }
     final int length = haystack.length();
     int start = 0;
     // Replace up to 32 occurrences before the string reallocates its buffer.
     final StringBuilder sb = new StringBuilder( length + 32 );
     while( end >= 0 ) {
       sb.append( haystack, start, end ).append( thread );
       start = end + 1;
       end = haystack.indexOf( needle, start );
+    }
     return sb.append( haystack.substring( start ) ).toString();
+  }
+}

A src/main/java/com/scrivenvar/processors/XMLProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.Snitch;
 import net.sf.saxon.TransformerFactoryImpl;
 import net.sf.saxon.trans.XPathException;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.ProcessingInstruction;
 import javax.xml.stream.events.XMLEvent;
 import javax.xml.transform.*;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import java.io.File;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import static net.sf.saxon.tree.util.ProcInstParser.getPseudoAttribute;
 /**
  * Transforms an XML document. The XML document must have a stylesheet specified
  * as part of its processing instructions, such as:
+ *
  * <code>xml-stylesheet type="text/xsl" href="markdown.xsl"</code>
  * <p>
  * The XSL must transform the XML document into Markdown, or another format
  * recognized by the next link on the chain.
+ *
  * @author White Magic Software, Ltd.
  */
 public class XMLProcessor extends AbstractProcessor<String>
     implements ErrorListener {
   private final Snitch snitch = Services.load( Snitch.class );
   private XMLInputFactory xmlInputFactory;
   private TransformerFactory transformerFactory;
   private Transformer transformer;
   private Path path;
   /**
    * Constructs an XML processor that can transform an XML document into another
    * format based on the XSL file specified as a processing instruction. The
    * path must point to the directory where the XSL file is found, which implies
    * that they must be in the same directory.
+   *
    * @param processor Next link in the processing chain.
    * @param path      The path to the XML file content to be processed.
    */
   public XMLProcessor( final Processor<String> processor, final Path path ) {
     super( processor );
     setPath( path );
+  }
   /**
    * Transforms the given XML text into another form (typically Markdown).
+   *
    * @param text The text to transform, can be empty, cannot be null.
    * @return The transformed text, or empty if text is empty.
    */
   @Override
   public String processLink( final String text ) {
     try {
       return text.isEmpty() ? text : transform( text );
     } catch( final Exception ex ) {
       throw new RuntimeException( ex );
+    }
+  }
   /**
    * Performs an XSL transformation on the given XML text. The XML text must
    * have a processing instruction that points to the XSL template file to use
    * for the transformation.
+   *
    * @param text The text to transform.
    * @return The transformed text.
    */
   private String transform( final String text ) throws Exception {
     // Extract the XML stylesheet processing instruction.
     final String template = getXsltFilename( text );
     final Path xsl = getXslPath( template );
     try(
         final StringWriter output = new StringWriter( text.length() );
         final StringReader input = new StringReader( text ) ) {
       // Listen for external file modification events.
       getSnitch().listen( xsl );
       getTransformer( xsl ).transform(
           new StreamSource( input ),
           new StreamResult( output )
       );
       return output.toString();
+    }
+  }
   /**
    * Returns an XSL transformer ready to transform an XML document using the
    * XSLT file specified by the given path. If the path is already known then
    * this will return the associated transformer.
+   *
    * @param xsl The path to an XSLT file.
    * @return A transformer that will transform XML documents using the given
    * XSLT file.
    * @throws TransformerConfigurationException Could not instantiate the
    *                                           transformer.
    */
   private Transformer getTransformer( final Path xsl )
       throws TransformerConfigurationException {
     if( this.transformer == null ) {
       this.transformer = createTransformer( xsl );
+    }
     return this.transformer;
+  }
   /**
    * Creates a configured transformer ready to run.
+   *
    * @param xsl The stylesheet to use for transforming XML documents.
    * @return The edited XML document transformed into another format (usually
    * markdown).
    * @throws TransformerConfigurationException Could not create the transformer.
    */
   protected Transformer createTransformer( final Path xsl )
       throws TransformerConfigurationException {
     final Source xslt = new StreamSource( xsl.toFile() );
     return getTransformerFactory().newTransformer( xslt );
+  }
   private Path getXslPath( final String filename ) {
     final Path xmlPath = getPath();
     final File xmlDirectory = xmlPath.toFile().getParentFile();
     return Paths.get( xmlDirectory.getPath(), filename );
+  }
   /**
    * Given XML text, this will use a StAX pull reader to obtain the XML
    * stylesheet processing instruction. This will throw a parse exception if the
    * href pseudo-attribute filename value cannot be found.
+   *
    * @param xml The XML containing an xml-stylesheet processing instruction.
    * @return The href pseudo-attribute value.
    * @throws XMLStreamException Could not parse the XML file.
    */
   private String getXsltFilename( final String xml )
       throws XMLStreamException, XPathException {
     String result = "";
     try( final StringReader sr = new StringReader( xml ) ) {
       boolean found = false;
       int count = 0;
       final XMLEventReader reader = createXMLEventReader( sr );
       // If the processing instruction wasn't found in the first 10 lines,
       // fail fast. This should iterate twice through the loop.
       while( !found && reader.hasNext() && count++ < 10 ) {
         final XMLEvent event = reader.nextEvent();
         if( event.isProcessingInstruction() ) {
           final ProcessingInstruction pi = (ProcessingInstruction) event;
           final String target = pi.getTarget();
           if( "xml-stylesheet".equalsIgnoreCase( target ) ) {
             result = getPseudoAttribute( pi.getData(), "href" );
             found = true;
+          }
+        }
+      }
+    }
     return result;
+  }
   private XMLEventReader createXMLEventReader( final Reader reader )
       throws XMLStreamException {
     return getXMLInputFactory().createXMLEventReader( reader );
+  }
   private synchronized XMLInputFactory getXMLInputFactory() {
     if( this.xmlInputFactory == null ) {
       this.xmlInputFactory = createXMLInputFactory();
+    }
     return this.xmlInputFactory;
+  }
   private XMLInputFactory createXMLInputFactory() {
     return XMLInputFactory.newInstance();
+  }
   private synchronized TransformerFactory getTransformerFactory() {
     if( this.transformerFactory == null ) {
       this.transformerFactory = createTransformerFactory();
+    }
     return this.transformerFactory;
+  }
   /**
    * Returns a high-performance XSLT 2 transformation engine.
+   *
    * @return An XSL transforming engine.
    */
   private TransformerFactory createTransformerFactory() {
     final TransformerFactory factory = new TransformerFactoryImpl();
     // Bubble problems up to the user interface, rather than standard error.
     factory.setErrorListener( this );
     return factory;
+  }
   /**
    * Called when the XSL transformer issues a warning.
+   *
    * @param ex The problem the transformer encountered.
    */
   @Override
   public void warning( final TransformerException ex ) {
     throw new RuntimeException( ex );
+  }
   /**
    * Called when the XSL transformer issues an error.
+   *
    * @param ex The problem the transformer encountered.
    */
   @Override
   public void error( final TransformerException ex ) {
     throw new RuntimeException( ex );
+  }
   /**
    * Called when the XSL transformer issues a fatal error, which is probably
    * a bit over-dramatic a method name.
+   *
    * @param ex The problem the transformer encountered.
    */
   @Override
   public void fatalError( final TransformerException ex ) {
     throw new RuntimeException( ex );
+  }
   private void setPath( final Path path ) {
     this.path = path;
+  }
   private Path getPath() {
     return this.path;
+  }
   private Snitch getSnitch() {
     return this.snitch;
+  }
+}

A src/main/java/com/scrivenvar/processors/markdown/ImageLinkExtension.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.markdown;
 import com.scrivenvar.Services;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.ProtocolResolver;
 import com.vladsch.flexmark.ast.Image;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.IndependentLinkResolverFactory;
 import com.vladsch.flexmark.html.LinkResolver;
 import com.vladsch.flexmark.html.renderer.LinkResolverBasicContext;
 import com.vladsch.flexmark.html.renderer.LinkStatus;
 import com.vladsch.flexmark.html.renderer.ResolvedLink;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import org.jetbrains.annotations.NotNull;
 import org.renjin.repackaged.guava.base.Splitter;
 import java.io.File;
 import java.nio.file.Path;
 import static java.lang.String.format;
 /**
  * Responsible for ensuring that images can be rendered relative to a path.
  * This allows images to be located virtually anywhere.
+ *
  * @author White Magic Software, Ltd.
  */
 public class ImageLinkExtension implements HtmlRenderer.HtmlRendererExtension {
   private final static Options sOptions = Services.load( Options.class );
   private final static Notifier sNotifier = Services.load( Notifier.class );
   /**
    * Creates an extension capable of using a relative path to embed images.
+   *
    * @param path The {@link Path} to the file being edited; the parent path
    *             is the starting location of the relative image directory.
    * @return The new {@link ImageLinkExtension}, never {@code null}.
    */
   public static ImageLinkExtension create( final Path path ) {
     return new ImageLinkExtension( path );
+  }
   private class Factory extends IndependentLinkResolverFactory {
     @Override
     public @NotNull LinkResolver apply(
         @NotNull final LinkResolverBasicContext context ) {
       return new ImageLinkResolver();
+    }
+  }
   private class ImageLinkResolver implements LinkResolver {
     private final UserPreferences mUserPref = getUserPreferences();
     private final String mImagePrefix =
         mUserPref.getImagesDirectory().toString();
     private final String mImageSuffixes = mUserPref.getImagesOrder();
     public ImageLinkResolver() {
+    }
     // you can also set/clear/modify attributes through
     // ResolvedLink.getAttributes() and
     // ResolvedLink.getNonNullAttributes()
     @NotNull
     @Override
     public ResolvedLink resolveLink(
         @NotNull final Node node,
         @NotNull final LinkResolverBasicContext context,
         @NotNull final ResolvedLink link ) {
       return node instanceof Image ? resolve( link ) : link;
+    }
     @NotNull
     private ResolvedLink resolve( @NotNull final ResolvedLink link ) {
       String url = link.getUrl();
       try {
         final String imageFile = format( "%s/%s", getImagePrefix(), url );
         final String suffixes = getImageSuffixes();
         final String editDir = getEditDirectory();
         for( final String ext : Splitter.on( ' ' ).split( suffixes ) ) {
           final String imagePath = format(
               "%s/%s.%s", editDir, imageFile, ext );
           final File file = new File( imagePath );
           if( file.exists() ) {
             url = file.toString();
             break;
+          }
+        }
         final String protocol = ProtocolResolver.getProtocol( url );
         if( "file".equals( protocol ) ) {
           url = "file://" + url;
+        }
         return link.withStatus( LinkStatus.VALID ).withUrl( url );
       } catch( final Exception e ) {
         getNotifier().notify( e );
+      }
       return link;
+    }
     private String getImagePrefix() {
       return mImagePrefix;
+    }
     private String getImageSuffixes() {
       return mImageSuffixes;
+    }
     private String getEditDirectory() {
       return mPath.getParent().toString();
+    }
+  }
   private final Path mPath;
   private ImageLinkExtension( final Path path ) {
     mPath = path;
+  }
   @Override
   public void rendererOptions( @NotNull final MutableDataHolder options ) {
+  }
   @Override
   public void extend(
       final HtmlRenderer.Builder rendererBuilder,
       @NotNull final String rendererType ) {
     rendererBuilder.linkResolverFactory( new Factory() );
+  }
   private UserPreferences getUserPreferences() {
     return getOptions().getUserPreferences();
+  }
   private Options getOptions() {
     return sOptions;
+  }
   private Notifier getNotifier() {
     return sNotifier;
+  }
+}

A src/main/java/com/scrivenvar/processors/markdown/MarkdownProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.markdown;
 import com.scrivenvar.processors.AbstractProcessor;
 import com.scrivenvar.processors.Processor;
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
 import com.vladsch.flexmark.ext.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.ext.tables.TablesExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.IParse;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.misc.Extension;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import static com.scrivenvar.Constants.USER_DIRECTORY;
 /**
  * Responsible for parsing a Markdown document and rendering it as HTML.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownProcessor extends AbstractProcessor<String> {
   private final HtmlRenderer mRenderer;
   private final IParse mParser;
   public MarkdownProcessor(
       final Processor<String> successor ) {
     this( successor, Path.of( USER_DIRECTORY ) );
+  }
   /**
    * Constructs a new Markdown processor that can create HTML documents.
+   *
    * @param successor Usually the HTML Preview Processor.
    */
   public MarkdownProcessor(
       final Processor<String> successor, final Path path ) {
     super( successor );
     final Collection<Extension> extensions = new ArrayList<>();
     extensions.add( TablesExtension.create() );
     extensions.add( SuperscriptExtension.create() );
     extensions.add( StrikethroughSubscriptExtension.create() );
     extensions.add( ImageLinkExtension.create( path ) );
     mRenderer = HtmlRenderer.builder().extensions( extensions ).build();
     mParser = Parser.builder().extensions( extensions ).build();
+  }
   /**
    * Converts the given Markdown string into HTML, without the doctype, html,
    * head, and body tags.
+   *
    * @param markdown The string to convert from Markdown to HTML.
    * @return The HTML representation of the Markdown document.
    */
   @Override
   public String processLink( final String markdown ) {
     return toHtml( markdown );
+  }
   /**
    * Returns the AST in the form of a node for the given markdown document. This
    * can be used, for example, to determine if a hyperlink exists inside of a
    * paragraph.
+   *
    * @param markdown The markdown to convert into an AST.
    * @return The markdown AST for the given text (usually a paragraph).
    */
   public Node toNode( final String markdown ) {
     return parse( markdown );
+  }
   /**
    * Helper method to create an AST given some markdown.
+   *
    * @param markdown The markdown to parse.
    * @return The root node of the markdown tree.
    */
   private Node parse( final String markdown ) {
     return getParser().parse( markdown );
+  }
   /**
    * Converts a string of markdown into HTML.
+   *
    * @param markdown The markdown text to convert to HTML, must not be null.
    * @return The markdown rendered as an HTML document.
    */
   private String toHtml( final String markdown ) {
     return getRenderer().render( parse( markdown ) );
+  }
   /**
    * Creates the Markdown document processor.
+   *
    * @return A Parser that can build an abstract syntax tree.
    */
   private IParse getParser() {
     return mParser;
+  }
   private HtmlRenderer getRenderer() {
     return mRenderer;
+  }
+}

A src/main/java/com/scrivenvar/processors/text/AbstractTextReplacer.java

 /*
  * The MIT License
+ *
  * Copyright 2016 .
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 /**
  * Responsible for common behaviour across all text replacer implementations.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class AbstractTextReplacer implements TextReplacer {
   /**
    * Default (empty) constructor.
    */
   protected AbstractTextReplacer() {
+  }
   protected String[] keys( final Map<String, String> map ) {
     return map.keySet().toArray( new String[ 0 ] );
+  }
   protected String[] values( final Map<String, String> map ) {
     return map.values().toArray( new String[ 0 ] );
+  }
+}

A src/main/java/com/scrivenvar/processors/text/AhoCorasickReplacer.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 import org.ahocorasick.trie.Emit;
 import org.ahocorasick.trie.Trie.TrieBuilder;
 import static org.ahocorasick.trie.Trie.builder;
 /**
  * Replaces text using an Aho-Corasick algorithm.
+ *
  * @author White Magic Software, Ltd.
  */
 public class AhoCorasickReplacer extends AbstractTextReplacer {
   /**
    * Default (empty) constructor.
    */
   protected AhoCorasickReplacer() {
+  }
   @Override
   public String replace( final String text, final Map<String, String> map ) {
     // Create a buffer sufficiently large that re-allocations are minimized.
     final StringBuilder sb = new StringBuilder( (int)(text.length() * 1.25) );
     // The TrieBuilder should only match whole words and ignore overlaps (there
     // shouldn't be any).
     final TrieBuilder builder = builder().onlyWholeWords().ignoreOverlaps();
     for( final String key : keys( map ) ) {
       builder.addKeyword( key );
+    }
     int index = 0;
     // Replace all instances with dereferenced variables.
     for( final Emit emit : builder.build().parseText( text ) ) {
       sb.append( text, index, emit.getStart() );
       sb.append( map.get( emit.getKeyword() ) );
       index = emit.getEnd() + 1;
+    }
     // Add the remainder of the string (contains no more matches).
     sb.append( text.substring( index ) );
     return sb.toString();
+  }
+}

A src/main/java/com/scrivenvar/processors/text/StringUtilsReplacer.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 import static org.apache.commons.lang3.StringUtils.replaceEach;
 /**
  * Replaces text using Apache's StringUtils.replaceEach method.
+ *
  * @author White Magic Software, Ltd.
  */
 public class StringUtilsReplacer extends AbstractTextReplacer {
   /**
    * Default (empty) constructor.
    */
   protected StringUtilsReplacer() {
+  }
   @Override
   public String replace( final String text, final Map<String, String> map ) {
     return replaceEach( text, keys( map ), values( map ) );
+  }
+}

A src/main/java/com/scrivenvar/processors/text/TextReplacementFactory.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 /**
  * Used to generate a class capable of efficiently replacing variable
  * definitions with their values.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class TextReplacementFactory {
   private final static TextReplacer APACHE = new StringUtilsReplacer();
   private final static TextReplacer AHO_CORASICK = new AhoCorasickReplacer();
   /**
    * Returns a text search/replacement instance that is reasonably optimal for
    * the given length of text.
+   *
    * @param length The length of text that requires some search and replacing.
+   *
    * @return A class that can search and replace text with utmost expediency.
    */
   public static TextReplacer getTextReplacer( final int length ) {
     // After about 1,500 characters, the StringUtils implementation is less
     // performant than the Aho-Corsick implementation.
     //
     // See http://stackoverflow.com/a/40836618/59087
     return length < 1500 ? APACHE : AHO_CORASICK;
+  }
   /**
    * Convenience method to instantiate a suitable text replacer algorithm and
    * perform a replacement using the given map. At this point, the values should
    * be already dereferenced and ready to be substituted verbatim; any
    * recursively defined values must have been interpolated previously.
+   *
    * @param text The text containing zero or more variables to replace.
    * @param map The map of variables to their dereferenced values.
+   *
    * @return The text with all variables replaced.
    */
   public static String replace(
     final String text, final Map<String, String> map ) {
     return getTextReplacer( text.length() ).replace( text, map );
+  }
+}

A src/main/java/com/scrivenvar/processors/text/TextReplacer.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 /**
  * Defines the ability to replace text given a set of keys and values.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface TextReplacer {
   /**
    * Searches through the given text for any of the keys given in the map and
    * replaces the keys that appear in the text with the key's corresponding
    * value.
+   *
    * @param text The text that contains zero or more keys.
    * @param map  The set of keys mapped to replacement values.
    * @return The given text with all keys replaced with corresponding values.
    */
   String replace( String text, Map<String, String> map );
+}

A src/main/java/com/scrivenvar/service/Options.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 import com.scrivenvar.preferences.UserPreferences;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 /**
  * Responsible for persisting options.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Options extends Service {
   /**
    * Returns a reference to the persistent settings that may be configured
    * through the UI.
+   *
    * @return A valid {@link UserPreferences} instance, never {@code null}.
    */
   UserPreferences getUserPreferences();
   /**
    * Returns the {@link Preferences} that persist settings that cannot
    * be configured via the user interface.
+   *
    * @return A valid {@link Preferences} instance, never {@code null}.
    */
   Preferences getState();
   /**
    * Stores the key and value into the user preferences to be loaded the next
    * time the application is launched.
+   *
    * @param key   Name of the key to persist along with its value.
    * @param value Value to associate with the key.
    * @throws BackingStoreException Could not persist the change.
    */
   void put( String key, String value ) throws BackingStoreException;
   /**
    * Retrieves the value for a key in the user preferences.
+   *
    * @param key          Retrieve the value of this key.
    * @param defaultValue The value to return in the event that the given key has
    *                     no associated value.
    * @return The value associated with the key.
    */
   String get( String key, String defaultValue );
   /**
    * Retrieves the value for a key in the user preferences. This will return
    * the empty string if the value cannot be found.
+   *
    * @param key The key to find in the preferences.
    * @return A non-null, possibly empty value for the key.
    */
   String get( String key );
+}

A src/main/java/com/scrivenvar/service/Service.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 /**
  * All services inherit from this one.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Service {
+}

A src/main/java/com/scrivenvar/service/Settings.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 import java.util.Iterator;
 import java.util.List;
 /**
  * Defines how settings and options can be retrieved.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Settings extends Service {
   /**
    * Returns a setting property or its default value.
+   *
    * @param property     The property key name to obtain its value.
    * @param defaultValue The default value to return iff the property cannot be
    *                     found.
    * @return The property value for the given property key.
    */
   String getSetting( String property, String defaultValue );
   /**
    * Returns a setting property or its default value.
+   *
    * @param property     The property key name to obtain its value.
    * @param defaultValue The default value to return iff the property cannot be
    *                     found.
    * @return The property value for the given property key.
    */
   int getSetting( String property, int defaultValue );
   /**
    * Returns a list of property names that begin with the given prefix. The
    * prefix is included in any matching results. This will return keys that
    * either match the prefix or start with the prefix followed by a dot ('.').
    * For example, a prefix value of <code>the.property.name</code> will likely
    * return the expected results, but <code>the.property.name.</code> (note the
    * extraneous period) will probably not.
+   *
    * @param prefix The prefix to compare against each property name.
    * @return The list of property names that have the given prefix.
    */
   Iterator<String> getKeys( final String prefix );
   /**
    * Convert the generic list of property objects into strings.
+   *
    * @param property The property value to coerce.
    * @param defaults The defaults values to use should the property be unset.
    * @return The list of properties coerced from objects to strings.
    */
   List<String> getStringSettingList( String property, List<String> defaults );
   /**
    * Converts the generic list of property objects into strings.
+   *
    * @param property The property value to coerce.
    * @return The list of properties coerced from objects to strings.
    */
   List<String> getStringSettingList( String property );
   /**
    * Changes key's value. This will clear the old value before setting the
    * new value so that the old value is erased, not changed into a list.
+   *
    * @param key   The property key name to obtain its value.
    * @param value The new value to set.
    */
   void putSetting( String key, String value );
+}

A src/main/java/com/scrivenvar/service/Snitch.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Observer;
 /**
  * Listens for changes to file system files and directories.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Snitch extends Service, Runnable {
   /**
    * Adds an observer to the set of observers for this object, provided that it
    * is not the same as some observer already in the set. The order in which
    * notifications will be delivered to multiple observers is not specified.
+   *
    * @param o The object to receive changed events for when monitored files
    *          are changed.
    */
   void addObserver( Observer o );
   /**
    * Listens for changes to the path. If the path specifies a file, then only
    * notifications pertaining to that file are sent. Otherwise, change events
    * for the directory that contains the file are sent. This method must allow
    * for multiple calls to the same file without incurring additional listeners
    * or events.
+   *
    * @param file Send notifications when this file changes, can be null.
    * @throws IOException Couldn't create a watcher for the given file.
    */
   void listen( Path file ) throws IOException;
   /**
    * Removes the given file from the notifications list.
+   *
    * @param file The file to stop monitoring for any changes, can be null.
    */
   void ignore( Path file );
   /**
    * Stop listening for events.
    */
   void stop();
+}

A src/main/java/com/scrivenvar/service/events/Notification.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events;
 /**
  * Represents a message that contains a title and content.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Notification {
   /**
    * Alert title.
+   *
    * @return A non-null string to use as alert message title.
    */
   String getTitle();
   /**
    * Alert message content.
+   *
    * @return A non-null string that contains information for the user.
    */
   String getContent();
+}

A src/main/java/com/scrivenvar/service/events/Notifier.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.stage.Window;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Observer;
 /**
  * Provides the application with a uniform way to notify the user of events.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Notifier {
   ButtonType YES = ButtonType.YES;
   ButtonType NO = ButtonType.NO;
   ButtonType CANCEL = ButtonType.CANCEL;
   /**
    * Notifies the user of a problem.
+   *
    * @param message The problem description.
    */
   void notify( final String message );
   /**
    * Notifies the user about the exception.
+   *
    * @param ex The exception containing a message to show to the user.
    */
   default void notify( final Exception ex ) {
     assert ex != null;
     log( ex );
     notify( ex.getMessage() );
+  }
   /**
    * Writes the exception to a log file. The log file should be written
    * in the System's temporary directory.
+   *
    * @param ex The exception to show in the status bar and log to a file.
    */
   default void log( final Exception ex ) {
     try(
         final FileWriter fw = new FileWriter( getLogPath(), true );
         final PrintWriter pw = new PrintWriter( fw )
     ) {
       ex.printStackTrace( pw );
     } catch( final IOException ioe ) {
       // The notify method will display the message on the status
       // bar.
+    }
+  }
   /**
    * Returns the fully qualified path to the log file to write to when
    * an exception occurs.
+   *
    * @return Location of the log file for writing unexpected exceptions.
    */
   File getLogPath();
   /**
    * Causes any displayed notifications to disappear.
    */
   void clear();
   /**
    * Constructs a default alert message text for a modal alert dialog.
+   *
    * @param title   The dialog box message title.
    * @param message The dialog box message content (needs formatting).
    * @param args    The arguments to the message content that must be formatted.
    * @return The message suitable for building a modal alert dialog.
    */
   Notification createNotification(
       String title,
       String message,
       Object... args );
   /**
    * Creates an alert of alert type error with a message showing the cause of
    * the error.
+   *
    * @param parent  Dialog box owner (for modal purposes).
    * @param message The error message, title, and possibly more details.
    * @return A modal alert dialog box ready to display using showAndWait.
    */
   Alert createError( Window parent, Notification message );
   /**
    * Creates an alert of alert type confirmation with Yes/No/Cancel buttons.
+   *
    * @param parent  Dialog box owner (for modal purposes).
    * @param message The message, title, and possibly more details.
    * @return A modal alert dialog box ready to display using showAndWait.
    */
   Alert createConfirmation( Window parent, Notification message );
   /**
    * Adds an observer to the list of objects that receive notifications about
    * error messages to be presented to the user.
+   *
    * @param observer The observer instance to notify.
    */
   void addObserver( Observer observer );
+}

A src/main/java/com/scrivenvar/service/events/impl/ButtonOrderPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events.impl;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.Settings;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonBar;
 import static javafx.scene.control.ButtonBar.BUTTON_ORDER_WINDOWS;
 import javafx.scene.control.DialogPane;
 /**
  * Ensures a consistent button order for alert dialogs across platforms (because
  * the default button order on Linux defies all logic).
+ *
  * @author White Magic Software, Ltd.
  */
 public class ButtonOrderPane extends DialogPane {
   @Override
   protected Node createButtonBar() {
     final ButtonBar node = (ButtonBar)super.createButtonBar();
     node.setButtonOrder( getButtonOrder() );
     return node;
+  }
   private String getButtonOrder() {
     return getSetting( "dialog.alert.button.order.windows", BUTTON_ORDER_WINDOWS );
+  }
   @SuppressWarnings("SameParameterValue")
   private String getSetting( final String key, final String defaultValue ) {
     return getSettings().getSetting( key, defaultValue );
+  }
   private Settings getSettings() {
     return Services.load( Settings.class );
+  }
+}

A src/main/java/com/scrivenvar/service/events/impl/DefaultNotification.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events.impl;
 import com.scrivenvar.service.events.Notification;
 import java.text.MessageFormat;
 /**
  * @author White Magic Software, Ltd.
  */
 public class DefaultNotification implements Notification {
   private final String title;
   private final String content;
   /**
    * Constructs default message text for a notification.
+   *
    * @param title   The message title.
    * @param message The message content (needs formatting).
    * @param args    The arguments to the message content that must be formatted.
    */
   public DefaultNotification(
       final String title,
       final String message,
       final Object... args ) {
     this.title = title;
     this.content = MessageFormat.format( message, args );
+  }
   @Override
   public String getTitle() {
     return this.title;
+  }
   @Override
   public String getContent() {
     return this.content;
+  }
+}

A src/main/java/com/scrivenvar/service/events/impl/DefaultNotifier.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events.impl;
 import com.scrivenvar.service.events.Notification;
 import com.scrivenvar.service.events.Notifier;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.stage.Window;
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Observable;
 import static com.scrivenvar.Constants.APP_TITLE;
 import static com.scrivenvar.Constants.STATUS_BAR_OK;
 import static com.scrivenvar.Messages.get;
 import static javafx.scene.control.Alert.AlertType.CONFIRMATION;
 import static javafx.scene.control.Alert.AlertType.ERROR;
 /**
  * Provides the ability to notify the user of problems.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class DefaultNotifier extends Observable implements Notifier {
   private final static String OK = get( STATUS_BAR_OK, "OK" );
   /**
    * Notifies all observer instances of the given message.
+   *
    * @param message The text to display to the user.
    */
   @Override
   public void notify( final String message ) {
     if( message != null && !message.isBlank() ) {
       setChanged();
       notifyObservers( message );
+    }
+  }
   @Override
   public void clear() {
     notify( OK );
+  }
   /**
    * Contains all the information that the user needs to know about a problem.
+   *
    * @param title   The context for the message.
    * @param message The message content (formatted with the given args).
    * @param args    Parameters for the message content.
    * @return A notification instance, never null.
    */
   @Override
   public Notification createNotification(
       final String title,
       final String message,
       final Object... args ) {
     return new DefaultNotification( title, message, args );
+  }
   private Alert createAlertDialog(
       final Window parent,
       final AlertType alertType,
       final Notification message ) {
     final Alert alert = new Alert( alertType );
     alert.setDialogPane( new ButtonOrderPane() );
     alert.setTitle( message.getTitle() );
     alert.setHeaderText( null );
     alert.setContentText( message.getContent() );
     alert.initOwner( parent );
     return alert;
+  }
   @Override
   public Alert createConfirmation( final Window parent,
                                    final Notification message ) {
     final Alert alert = createAlertDialog( parent, CONFIRMATION, message );
     alert.getButtonTypes().setAll( YES, NO, CANCEL );
     return alert;
+  }
   @Override
   public Alert createError( final Window parent, final Notification message ) {
     return createAlertDialog( parent, ERROR, message );
+  }
   @Override
   public File getLogPath() {
     return Paths.get(
         System.getProperty( "java.io.tmpdir" ), APP_TITLE + ".log" ).toFile();
+  }
+}

A src/main/java/com/scrivenvar/service/impl/DefaultOptions.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.impl;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.service.Options;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 import static com.scrivenvar.Constants.PREFS_ROOT;
 import static com.scrivenvar.Constants.PREFS_STATE;
 import static java.util.prefs.Preferences.userRoot;
 /**
  * Persistent options user can change at runtime.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class DefaultOptions implements Options {
   private final UserPreferences mPreferences = new UserPreferences();
   public DefaultOptions() {
+  }
   /**
    * This will throw IllegalArgumentException if the value exceeds the maximum
    * preferences value length.
+   *
    * @param key   The name of the key to associate with the value.
    * @param value The value to persist.
    * @throws BackingStoreException New value not persisted.
    */
   @Override
   public void put( final String key, final String value )
       throws BackingStoreException {
     getState().put( key, value );
     getState().flush();
+  }
   @Override
   public String get( final String key, final String value ) {
     return getState().get( key, value );
+  }
   @Override
   public String get( final String key ) {
     return get( key, "" );
+  }
   private Preferences getRootPreferences() {
     return userRoot().node( PREFS_ROOT );
+  }
   @Override
   public Preferences getState() {
     return getRootPreferences().node( PREFS_STATE );
+  }
   @Override
   public UserPreferences getUserPreferences() {
     return mPreferences;
+  }
+}

A src/main/java/com/scrivenvar/service/impl/DefaultSettings.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.impl;
 import com.scrivenvar.service.Settings;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
 import org.apache.commons.configuration2.convert.ListDelimiterHandler;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.List;
 import static com.scrivenvar.Constants.SETTINGS_NAME;
 /**
  * Responsible for loading settings that help avoid hard-coded assumptions.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefaultSettings implements Settings {
   private static final char VALUE_SEPARATOR = ',';
   private PropertiesConfiguration properties;
   public DefaultSettings() throws ConfigurationException {
     setProperties( createProperties() );
+  }
   /**
    * Returns the value of a string property.
+   *
    * @param property     The property key.
    * @param defaultValue The value to return if no property key has been set.
    * @return The property key value, or defaultValue when no key found.
    */
   @Override
   public String getSetting( final String property, final String defaultValue ) {
     return getSettings().getString( property, defaultValue );
+  }
   /**
    * Returns the value of a string property.
+   *
    * @param property     The property key.
    * @param defaultValue The value to return if no property key has been set.
    * @return The property key value, or defaultValue when no key found.
    */
   @Override
   public int getSetting( final String property, final int defaultValue ) {
     return getSettings().getInt( property, defaultValue );
+  }
   /**
    * Changes key's value. This will clear the old value before setting the new
    * value so that the old value is erased, not changed into a list.
+   *
    * @param key   The property key name to obtain its value.
    * @param value The new value to set.
    */
   @Override
   public void putSetting( final String key, final String value ) {
     getSettings().clearProperty( key );
     getSettings().addProperty( key, value );
+  }
   /**
    * Convert the generic list of property objects into strings.
+   *
    * @param property The property value to coerce.
    * @param defaults The defaults values to use should the property be unset.
    * @return The list of properties coerced from objects to strings.
    */
   @Override
   public List<String> getStringSettingList(
       final String property, final List<String> defaults ) {
     return getSettings().getList( String.class, property, defaults );
+  }
   /**
    * Convert a list of property objects into strings, with no default value.
+   *
    * @param property The property value to coerce.
    * @return The list of properties coerced from objects to strings.
    */
   @Override
   public List<String> getStringSettingList( final String property ) {
     return getStringSettingList( property, null );
+  }
   /**
    * Returns a list of property names that begin with the given prefix.
+   *
    * @param prefix The prefix to compare against each property name.
    * @return The list of property names that have the given prefix.
    */
   @Override
   public Iterator<String> getKeys( final String prefix ) {
     return getSettings().getKeys( prefix );
+  }
   private PropertiesConfiguration createProperties()
       throws ConfigurationException {
     final URL url = getPropertySource();
     final PropertiesConfiguration configuration = new PropertiesConfiguration();
     if( url != null ) {
       try( final Reader r = new InputStreamReader( url.openStream(),
                                                    getDefaultEncoding() ) ) {
         configuration.setListDelimiterHandler( createListDelimiterHandler() );
         configuration.read( r );
       } catch( final IOException ex ) {
         throw new RuntimeException( new ConfigurationException( ex ) );
+      }
+    }
     return configuration;
+  }
   protected Charset getDefaultEncoding() {
     return Charset.defaultCharset();
+  }
   protected ListDelimiterHandler createListDelimiterHandler() {
     return new DefaultListDelimiterHandler( VALUE_SEPARATOR );
+  }
   private URL getPropertySource() {
     return DefaultSettings.class.getResource( getSettingsFilename() );
+  }
   private String getSettingsFilename() {
     return SETTINGS_NAME;
+  }
   private void setProperties( final PropertiesConfiguration configuration ) {
     this.properties = configuration;
+  }
   private PropertiesConfiguration getSettings() {
     return this.properties;
+  }
+}

A src/main/java/com/scrivenvar/service/impl/DefaultSnitch.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.impl;
 import com.scrivenvar.service.Snitch;
 import java.io.IOException;
 import java.nio.file.*;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Observable;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import static com.scrivenvar.Constants.APP_WATCHDOG_TIMEOUT;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 /**
  * Listens for file changes. Other classes can register paths to be monitored
  * and listen for changes to those paths.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefaultSnitch extends Observable implements Snitch {
   /**
    * Service for listening to directories for modifications.
    */
   private WatchService watchService;
   /**
    * Directories being monitored for changes.
    */
   private Map<WatchKey, Path> keys;
   /**
    * Files that will kick off notification events if modified.
    */
   private Set<Path> eavesdropped;
   /**
    * Set to true when running; set to false to stop listening.
    */
   private volatile boolean listening;
   public DefaultSnitch() {
+  }
   @Override
   public void stop() {
     setListening( false );
+  }
   /**
    * Adds a listener to the list of files to watch for changes. If the file is
    * already in the monitored list, this will return immediately.
+   *
    * @param file Path to a file to watch for changes.
    * @throws IOException The file could not be monitored.
    */
   @Override
   public void listen( final Path file ) throws IOException {
     if( file != null && getEavesdropped().add( file ) ) {
       final Path dir = toDirectory( file );
       final WatchKey key = dir.register( getWatchService(), ENTRY_MODIFY );
       getWatchMap().put( key, dir );
+    }
+  }
   /**
    * Returns the given path to a file (or directory) as a directory. If the
    * given path is already a directory, it is returned. Otherwise, this returns
    * the directory that contains the file. This will fail if the file is stored
    * in the root folder.
+   *
    * @param path The file to return as a directory, which should always be the
    *             case.
    * @return The given path as a directory, if a file, otherwise the path
    * itself.
    */
   private Path toDirectory( final Path path ) {
     return Files.isDirectory( path )
         ? path
         : path.toFile().getParentFile().toPath();
+  }
   /**
    * Stop listening to the given file for change events. This fails silently.
+   *
    * @param file The file to no longer monitor for changes.
    */
   @Override
   public void ignore( final Path file ) {
     if( file != null ) {
       final Path directory = toDirectory( file );
       // Remove all occurrences (there should be only one).
       getWatchMap().values().removeAll( Collections.singleton( directory ) );
       // Remove all occurrences (there can be only one).
       getEavesdropped().remove( file );
+    }
+  }
   /**
    * Loops until stop is called, or the application is terminated.
    */
   @Override
   @SuppressWarnings("BusyWait")
   public void run() {
     setListening( true );
     while( isListening() ) {
       try {
         final WatchKey key = getWatchService().take();
         final Path path = get( key );
         // Prevent receiving two separate ENTRY_MODIFY events: file modified
         // and timestamp updated. Instead, receive one ENTRY_MODIFY event
         // with two counts.
         Thread.sleep( APP_WATCHDOG_TIMEOUT );
         for( final WatchEvent<?> event : key.pollEvents() ) {
           final Path changed = path.resolve( (Path) event.context() );
           if( event.kind() == ENTRY_MODIFY && isListening( changed ) ) {
             setChanged();
             notifyObservers( changed );
+          }
+        }
         if( !key.reset() ) {
           ignore( path );
+        }
       } catch( final IOException | InterruptedException ex ) {
         // Stop eavesdropping.
         setListening( false );
+      }
+    }
+  }
   /**
    * Returns true if the list of files being listened to for changes contains
    * the given file.
+   *
    * @param file Path to a system file.
    * @return true The given file is being monitored for changes.
    */
   private boolean isListening( final Path file ) {
     return getEavesdropped().contains( file );
+  }
   /**
    * Returns a path for a given watch key.
+   *
    * @param key The key to lookup its corresponding path.
    * @return The path for the given key.
    */
   private Path get( final WatchKey key ) {
     return getWatchMap().get( key );
+  }
   private synchronized Map<WatchKey, Path> getWatchMap() {
     if( this.keys == null ) {
       this.keys = createWatchKeys();
+    }
     return this.keys;
+  }
   protected Map<WatchKey, Path> createWatchKeys() {
     return new ConcurrentHashMap<>();
+  }
   /**
    * Returns a list of files that, when changed, will kick off a notification.
+   *
    * @return A non-null, possibly empty, list of files.
    */
   private synchronized Set<Path> getEavesdropped() {
     if( this.eavesdropped == null ) {
       this.eavesdropped = createEavesdropped();
+    }
     return this.eavesdropped;
+  }
   protected Set<Path> createEavesdropped() {
     return ConcurrentHashMap.newKeySet();
+  }
   /**
    * The existing watch service, or a new instance if null.
+   *
    * @return A valid WatchService instance, never null.
    * @throws IOException Could not create a new watch service.
    */
   private synchronized WatchService getWatchService() throws IOException {
     if( this.watchService == null ) {
       this.watchService = createWatchService();
+    }
     return this.watchService;
+  }
   protected WatchService createWatchService() throws IOException {
     final FileSystem fileSystem = FileSystems.getDefault();
     return fileSystem.newWatchService();
+  }
   /**
    * Answers whether the loop should continue executing.
+   *
    * @return true The internal listening loop should continue listening for file
    * modification events.
    */
   protected boolean isListening() {
     return this.listening;
+  }
   /**
    * Requests the snitch to stop eavesdropping on file changes.
+   *
    * @param listening Use true to indicate the service should stop running.
    */
   private void setListening( final boolean listening ) {
     this.listening = listening;
+  }
+}

A src/main/java/com/scrivenvar/util/Action.java

 /*
  * Copyright (c) 2015 Karl Tauber and White Magic Software, Ltd.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import de.jensd.fx.glyphs.GlyphIcons;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.input.KeyCombination;
 /**
  * Simple action class
+ *
  * @author Karl Tauber
  * @author White Magic Software, Ltd.
  */
 public class Action {
   public final String text;
   public final KeyCombination accelerator;
   public final GlyphIcons icon;
   public final EventHandler<ActionEvent> action;
   public final ObservableBooleanValue disable;
   public Action(
       final String text,
       final String accelerator,
       final GlyphIcons icon,
       final EventHandler<ActionEvent> action,
       final ObservableBooleanValue disable ) {
     this.text = text;
     this.accelerator = accelerator == null ?
         null : KeyCombination.valueOf( accelerator );
     this.icon = icon;
     this.action = action;
     this.disable = disable;
+  }
+}

A src/main/java/com/scrivenvar/util/ActionBuilder.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import com.scrivenvar.Messages;
 import de.jensd.fx.glyphs.GlyphIcons;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 /**
  * Provides a fluent interface around constructing actions so that duplication
  * can be avoided.
  */
 public class ActionBuilder {
   private String mText;
   private String mAccelerator;
   private GlyphIcons mIcon;
   private EventHandler<ActionEvent> mAction;
   private ObservableBooleanValue mDisable;
   /**
    * Sets the action text based on a resource bundle key.
+   *
    * @param key The key to look up in the {@link Messages}.
    * @return The corresponding value, or the key name if none found.
    */
   public ActionBuilder setText( final String key ) {
     mText = Messages.get( key, key );
     return this;
+  }
   public ActionBuilder setAccelerator( final String accelerator ) {
     mAccelerator = accelerator;
     return this;
+  }
   public ActionBuilder setIcon( final GlyphIcons icon ) {
     mIcon = icon;
     return this;
+  }
   public ActionBuilder setAction( final EventHandler<ActionEvent> action ) {
     mAction = action;
     return this;
+  }
   public ActionBuilder setDisable( final ObservableBooleanValue disable ) {
     mDisable = disable;
     return this;
+  }
   public Action build() {
     return new Action( mText, mAccelerator, mIcon, mAction, mDisable );
+  }
+}

A src/main/java/com/scrivenvar/util/ActionUtils.java

 /*
  * Copyright (c) 2015 Karl Tauber
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.Tooltip;
 /**
  * Action utilities
+ *
  * @author Karl Tauber
  * @author White Magic Software, Ltd.
  */
 public class ActionUtils {
   public static Menu createMenu( final String text, final Action... actions ) {
     return new Menu( text, null, createMenuItems( actions ) );
+  }
   public static MenuItem[] createMenuItems( final Action... actions ) {
     final MenuItem[] menuItems = new MenuItem[ actions.length ];
     for( int i = 0; i < actions.length; i++ ) {
       menuItems[ i ] = (actions[ i ] != null)
           ? createMenuItem( actions[ i ] )
           : new SeparatorMenuItem();
+    }
     return menuItems;
+  }
   public static MenuItem createMenuItem( final Action action ) {
     final MenuItem menuItem = new MenuItem( action.text );
     if( action.accelerator != null ) {
       menuItem.setAccelerator( action.accelerator );
+    }
     if( action.icon != null ) {
       menuItem.setGraphic(
           FontAwesomeIconFactory.get().createIcon( action.icon ) );
+    }
     menuItem.setOnAction( action.action );
     if( action.disable != null ) {
       menuItem.disableProperty().bind( action.disable );
+    }
     menuItem.setMnemonicParsing( true );
     return menuItem;
+  }
   public static ToolBar createToolBar( final Action... actions ) {
     return new ToolBar( createToolBarButtons( actions ) );
+  }
   public static Node[] createToolBarButtons( final Action... actions ) {
     Node[] buttons = new Node[ actions.length ];
     for( int i = 0; i < actions.length; i++ ) {
       buttons[ i ] = (actions[ i ] != null)
           ? createToolBarButton( actions[ i ] )
           : new Separator();
+    }
     return buttons;
+  }
   public static Button createToolBarButton( final Action action ) {
     final Button button = new Button();
     button.setGraphic(
         FontAwesomeIconFactory
             .get()
             .createIcon( action.icon, "1.2em" ) );
     String tooltip = action.text;
     if( tooltip.endsWith( "..." ) ) {
       tooltip = tooltip.substring( 0, tooltip.length() - 3 );
+    }
     if( action.accelerator != null ) {
       tooltip += " (" + action.accelerator.getDisplayText() + ')';
+    }
     button.setTooltip( new Tooltip( tooltip ) );
     button.setFocusTraversable( false );
     button.setOnAction( action.action );
     if( action.disable != null ) {
       button.disableProperty().bind( action.disable );
+    }
     return button;
+  }
+}

A src/main/java/com/scrivenvar/util/Lists.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import java.util.List;
 /**
  * Convenience class that provides a clearer API for obtaining list elements.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class Lists {
   private Lists() {
+  }
   /**
    * Returns the first item in the given list, or null if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a first item.
+   *
    * @return null if the list is null or there is no first item.
    */
   public static <T> T getFirst( final List<T> list ) {
     return getFirst( list, null );
+  }
   /**
    * Returns the last item in the given list, or null if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a last item.
+   *
    * @return null if the list is null or there is no last item.
    */
   public static <T> T getLast( final List<T> list ) {
     return getLast( list, null );
+  }
   /**
    * Returns the first item in the given list, or t if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a first item.
    * @param t The default return value.
+   *
    * @return null if the list is null or there is no first item.
    */
   public static <T> T getFirst( final List<T> list, final T t ) {
     return isEmpty( list ) ? t : list.get( 0 );
+  }
   /**
    * Returns the last item in the given list, or t if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a last item.
    * @param t The default return value.
+   *
    * @return null if the list is null or there is no last item.
    */
   public static <T> T getLast( final List<T> list, final T t ) {
     return isEmpty( list ) ? t : list.get( list.size() - 1 );
+  }
   /**
    * Returns true if the given list is null or empty.
+   *
    * @param <T> The generic list type.
    * @param list The list that has a last item.
+   *
    * @return true The list is empty.
    */
   public static <T> boolean isEmpty( final List<T> list ) {
     return list == null || list.isEmpty();
+  }
+}

A src/main/java/com/scrivenvar/util/ProtocolResolver.java

 package com.scrivenvar.util;
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
 import static com.scrivenvar.Constants.DEFINITION_PROTOCOL_UNKNOWN;
 /**
  * Responsible for determining the protocol of a resource.
  */
 public class ProtocolResolver {
   /**
    * Returns the protocol for a given URI or filename.
+   *
    * @param resource Determine the protocol for this URI or filename.
    * @return The protocol for the given source.
    */
   public static String getProtocol( final String resource ) {
     String protocol;
     try {
       final URI uri = new URI( resource );
       if( uri.isAbsolute() ) {
         protocol = uri.getScheme();
+      }
       else {
         final URL url = new URL( resource );
         protocol = url.getProtocol();
+      }
     } catch( final Exception e ) {
       // Could be HTTP, HTTPS?
       if( resource.startsWith( "//" ) ) {
         throw new IllegalArgumentException( "Relative context: " + resource );
+      }
       else {
         final File file = new File( resource );
         protocol = getProtocol( file );
+      }
+    }
     return protocol;
+  }
   /**
    * Returns the protocol for a given file.
+   *
    * @param file Determine the protocol for this file.
    * @return The protocol for the given file.
    */
   public static String getProtocol( final File file ) {
     String result;
     try {
       result = file.toURI().toURL().getProtocol();
     } catch( final Exception e ) {
       result = DEFINITION_PROTOCOL_UNKNOWN;
+    }
     return result;
+  }
+}

A src/main/java/com/scrivenvar/util/StageState.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import java.util.prefs.Preferences;
 import javafx.application.Platform;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 /**
  * Saves and restores Stage state (window bounds, maximized, fullScreen).
+ *
  * @author Karl Tauber
  */
 public class StageState {
   public static final String K_PANE_SPLIT_DEFINITION = "pane.split.definition";
   public static final String K_PANE_SPLIT_EDITOR = "pane.split.editor";
   public static final String K_PANE_SPLIT_PREVIEW = "pane.split.preview";
   private final Stage mStage;
   private final Preferences mState;
   private Rectangle normalBounds;
   private boolean runLaterPending;
   public StageState( final Stage stage, final Preferences state ) {
     mStage = stage;
     mState = state;
     restore();
     stage.addEventHandler( WindowEvent.WINDOW_HIDING, e -> save() );
     stage.xProperty().addListener( ( ob, o, n ) -> boundsChanged() );
     stage.yProperty().addListener( ( ob, o, n ) -> boundsChanged() );
     stage.widthProperty().addListener( ( ob, o, n ) -> boundsChanged() );
     stage.heightProperty().addListener( ( ob, o, n ) -> boundsChanged() );
+  }
   private void save() {
     final Rectangle bounds = isNormalState() ? getStageBounds() : normalBounds;
     if( bounds != null ) {
       mState.putDouble( "windowX", bounds.getX() );
       mState.putDouble( "windowY", bounds.getY() );
       mState.putDouble( "windowWidth", bounds.getWidth() );
       mState.putDouble( "windowHeight", bounds.getHeight() );
+    }
     mState.putBoolean( "windowMaximized", mStage.isMaximized() );
     mState.putBoolean( "windowFullScreen", mStage.isFullScreen() );
+  }
   private void restore() {
     final double x = mState.getDouble( "windowX", Double.NaN );
     final double y = mState.getDouble( "windowY", Double.NaN );
     final double w = mState.getDouble( "windowWidth", Double.NaN );
     final double h = mState.getDouble( "windowHeight", Double.NaN );
     final boolean maximized = mState.getBoolean( "windowMaximized", false );
     final boolean fullScreen = mState.getBoolean( "windowFullScreen", false );
     if( !Double.isNaN( x ) && !Double.isNaN( y ) ) {
       mStage.setX( x );
       mStage.setY( y );
     } // else: default behavior is center on screen
     if( !Double.isNaN( w ) && !Double.isNaN( h ) ) {
       mStage.setWidth( w );
       mStage.setHeight( h );
     } // else: default behavior is use scene size
     if( fullScreen != mStage.isFullScreen() ) {
       mStage.setFullScreen( fullScreen );
+    }
     if( maximized != mStage.isMaximized() ) {
       mStage.setMaximized( maximized );
+    }
+  }
   /**
    * Remembers the window bounds when the window is not iconified, maximized or
    * in fullScreen.
    */
   private void boundsChanged() {
     // avoid too many (and useless) runLater() invocations
     if( runLaterPending ) {
       return;
+    }
     runLaterPending = true;
     // must use runLater() to ensure that change of all properties
     // (x, y, width, height, iconified, maximized and fullScreen)
     // has finished
     Platform.runLater( () -> {
       runLaterPending = false;
       if( isNormalState() ) {
         normalBounds = getStageBounds();
+      }
     } );
+  }
   private boolean isNormalState() {
     return !mStage.isIconified() &&
         !mStage.isMaximized() &&
         !mStage.isFullScreen();
+  }
   private Rectangle getStageBounds() {
     return new Rectangle(
         mStage.getX(),
         mStage.getY(),
         mStage.getWidth(),
         mStage.getHeight()
     );
+  }
+}

A src/main/java/com/scrivenvar/util/Utils.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import java.util.ArrayList;
 import java.util.prefs.Preferences;
 /**
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class Utils {
   public static String ltrim( final String s ) {
     int i = 0;
     while( i < s.length() && Character.isWhitespace( s.charAt( i ) ) ) {
       i++;
+    }
     return s.substring( i );
+  }
   public static String rtrim( final String s ) {
     int i = s.length() - 1;
     while( i >= 0 && Character.isWhitespace( s.charAt( i ) ) ) {
       i--;
+    }
     return s.substring( 0, i + 1 );
+  }
   public static String[] getPrefsStrings( final Preferences prefs,
                                           String key ) {
     final ArrayList<String> arr = new ArrayList<>( 256 );
     for( int i = 0; i < 10000; i++ ) {
       final String s = prefs.get( key + (i + 1), null );
       if( s == null ) {
         break;
+      }
       arr.add( s );
+    }
     return arr.toArray( new String[ 0 ] );
+  }
   public static void putPrefsStrings( Preferences prefs, String key,
                                       String[] strings ) {
     for( int i = 0; i < strings.length; i++ ) {
       prefs.put( key + (i + 1), strings[ i ] );
+    }
     for( int i = strings.length; prefs.get( key + (i + 1),
                                             null ) != null; i++ ) {
       prefs.remove( key + (i + 1) );
+    }
+  }
+}

A src/main/r/README.md

 # R Scripts
 These R scripts illustrate how R can be used within an application to perform calculations using variables. Authors are free to write their own scripts, of course. These scripts serve as an example of how to automate certain tasks while writing.
 ## Configuration
 Configure the editor to use the R scripts as follows:
 . Copy the R scripts into same directory as your Markdown files.
 . Start the editor.
 . Click **Tools → R Script**.
 . Copy and paste the following:
         assign( 'anchor', as.Date( '$date.anchor$', format='%Y-%m-%d' ), envir = .GlobalEnv );
         setwd( '$application.r.working.directory$' );
         source( 'pluralize.R' );
         source( 'csv.R' );
         source( 'conversion.R' );
 . Click **File → New** to create a new file.
 . Click **File → Save As** to set a filename.
 . Set **Name** to: `variables.yaml`
 . Click **OK**.
 . Paste the following definitions:
         date:
           anchor: 2017-01-01
         editor:
           examples:
             season: 2017-09-02
             math:
               x: 1
               y: $editor.examples.math.x$ + 1
               z: $editor.examples.math.y$ + 1
             name:
               given: Josephene
 . Save and close the file.
 . Click **File → Open**
 . Change **Markdown Files** to **Definition Files**.
 . Select `variables.yaml`.
 . Click **Open**.
 R functionality is configured.
 ## Definitions
 The variables definitions within `variables.yaml` are available to R using the R syntax. An additional variable, `application.r.working.directory` is added to the list of variables. The value is set to the working directory of the file being edited. Hover the mouse cursor over the file tab in the editor to see the full path to the file.
 ## Examples
 This section demonstrates how to use the R functions when editing. Complete the following steps to begin:
 . Click **File → New** to create a new file.
 . Click **File → Save As** to set a filename.
 . Set **Name** to: `example.Rmd`
 . Click **OK**.
 The examples are ready for use within the editor.
 ### Arithmetic
 Type the following to perform a simple calculation:
     `r# 1+1`
 The preview pane shows `2.0`.
 ### Functions
 Call the [format](https://stat.ethz.ch/R-manual/R-devel/library/base/html/format.html) function to truncate unwanted decimal places as follows:
     `r# format(1+1,digits=1)`
 The preview pane shows `2`.
 ### Pluralize
 Many English words can be pluralized as follows:
     `r# pl('wolf',2)`
 The preview pane shows `wolves`. The `pluralize.R` file contains a partial implementation of Damian Conway's algorithmic approach to English pluralization.
 ### Chicago Manual of Style
 Apply the Chicago Manual of Style for words less than one-hundred as follows:
        `r# cms(1)` `r# cms(99)` `r# cms(101)`
 The preview pane shows numbers written out as `one` and `ninety-nine`, followed by the digits 101.
 ### Data Import
 Import and display information from a CSV file as follows:
 . Click **File → New** to create a new file.
 . Click **File → Save As** to rename the file.
 . Set the filename to: `data.csv`
 . Paste the following into `data.csv`:
         Animal,Quantity,Country
         Aardwolf,1,Africa
         Keel-billed toucan,1,Belize
         Beaver,2,Canada
         Mute swan,3,Denmark
         Lion,5,Ethiopia
         Brown bear,8,Finland
         Dolphin,13,Greece
         Turul,21,Hungary
         Gyrfalcon,34,Iceland
         Red-billed streamertail,55,Jamaica
 . Click the `example.Rmd` tab.
 . Type the following:
        `r# csv2md('data.csv',total=F)`
 . Type the following to calculate a total for all numeric columns:
        `r# csv2md('data.csv')`
 This imports the data from an external file and formats the information into a table, automatically. Update the data as follows:
 . Click the `data.csv` tab to edit the data.
 . Change the data by adding a new row.
 . Save the file.
 . Click the `example.Rmd` tab.
 The preview pane shows the revised contents.
 ### Elapsed Time
 The duration of a timeline, given in numbers of days, can be computed into English as follows:
     `r# elapsed(1,1)`
 The preview pane shows `same day`. Change the expression to:
     `r# elapsed(1,2)`
 The preview pane shows `one day`. Change the expression to:
     `r# elapsed(1,112358)`
 The preview pane shows `307 years, seven months, and sixteen days`, combined using the Chicago Manual of Style, the pluralization function, and a [serial comma](https://www.behance.net/gallery/19417363/The-Oxford-Comma).
 ### Variable Syntax
 The syntax for a variable changes when using an R Markdown file (denoted by the `.Rmd` filename extension), as opposed to a regular Markdown file (`.md`). Return to the example file and type the following:
     `r# v$date$anchor`
 The preview pane shows the date.
 ### Autocomplete
 Automatically insert a variable reference into the text as follows:
 . Type: `Jos`
     * Note the capital letter, matches are case sensitive.
 . Hold down the `Control` key.
 . Tap the `Spacebar`
 The editor shows:
     `r#x( v$editor$examples$name$given )`
 The preview pane shows:
     Josephine
 Here, the `x` function evaluates its parameter as an expression. This allows variables to include expressions in their definition.
 ### Variable Definition Expressions
 Definition file variables are have the ability to reference other definitions. Try the following:
     x = `r#x( v$editor$examples$math$x )`;
     y = `r#x( v$editor$examples$math$y )`;
     z = `r#x( v$editor$examples$math$z )`
 The preview pane shows:
     x = 1.0; y = 2.0; z = 3.0
 ### Case
 Ensure words begin with a lowercase letter as follows:
     `r#lc( v$editor$examples$name$given )`
 The preview pane shows:
     josephine
 Similarly, ensure an uppercase letter as follows:
     `r#uc( 'hello, world!' )`
 The preview pane shows:
     Hello, world!
 ### Month
 Display the month name given a month number as follows:
     `r# month( 1 )`
 The preview pane shows:
     January
 ## Summary
 Authors can inline R statements into documents, directly, so long as those statements generate text. Plots, graphs, and images must be referenced as external image files or URLs.

A src/main/r/conversion.R

 # ########################################################################
+#
 # Substitute R expressions in a document with their evaluated value. The
 # anchor variable must be set for functions that use relative dates.
+#
 # ########################################################################
 # Evaluates an expression; writes s if there is no expression.
 x <- function( s ) {
   return(
     tryCatch({
       r = eval( parse( text=s ) )
       # If the result isn't primitive, then it was probably parsed into
       # an unprintable object (e.g., "gray" becomes a colour). In those
       # cases, return the original text string. Otherwise, an atomic
       # value means a primitive type (string, integer, etc.) that can be
       # written directly into the document.
+      #
       # See: http://stackoverflow.com/a/19501276/59087
       if( is.atomic( r ) ) {
+        r
+      }
       else {
+        s
+      }
     },
     warning = function( w ) {
+      s
     },
     error = function( e ) {
+      s
     })
+  )
+}
 # Returns a date offset by a given number of days, relative to the given
 # date (d). This does not use the anchor, but is used to get the anchor's
 # value as a date.
 when <- function( d, n = 0, format = "%Y-%m-%d" ) {
   as.Date( d, format = format ) + x( n )
+}
 # Full date (s) offset by an optional number of days before or after.
 # This will remove leading zeros (applying leading spaces instead, which
 # are ignored by any worthwhile typesetting engine).
 annal <- function( days = 0, format = "%Y-%m-%d", oformat = "%B %d, %Y" ) {
   format( when( anchor, days ), format = oformat )
+}
 # Extracts the year from a date string.
 year <- function( days = 0, format = "%Y-%m-%d" ) {
   annal( days, format, "%Y" )
+}
 # Day of the week (in days since the anchor date).
 weekday <- function( n ) {
   weekdays( when( anchor, n ) )
+}
 # String concatenate function alias because paste0 is a terrible name.
 concat <- paste0
 # Translates a number from digits to words using Chicago Manual of Style.
 # This does not translate numbers greater than one hundred. If ordinal
 # is TRUE, this will return the ordinal name. This will not produce ordinals
 # for numbers greater than 100
 cms <- function( n, ordinal = FALSE ) {
   n <- x( n )
   # We're done here.
   if( n == 0 ) {
     if( ordinal ) {
       return( "zeroth" )
+    }
     return( "zero" )
+  }
   # Concatenate this a little later.
   if( n < 0 ) {
     result = "negative "
     n = abs( n )
+  }
   # Do not spell out numbers greater than one hundred.
   if( n > 100 ) {
     # Comma-separated numbers.
     return( format( n, big.mark=",", trim=TRUE, scientific=FALSE ) )
+  }
   # Don't go beyond 100.
   if( n == 100 ) {
     if( ordinal ) {
       return( "one hundredth" )
+    }
     return( "one hundred" )
+  }
   # Samuel Langhorne Clemens noted English has too many exceptions.
   small = c(
     "one", "two", "three", "four", "five",
     "six", "seven", "eight", "nine", "ten",
     "eleven", "twelve", "thirteen", "fourteen", "fifteen",
     "sixteen", "seventeen", "eighteen", "nineteen"
+  )
   ord_small = c(
     "first", "second", "third", "fourth", "fifth",
     "sixth", "seventh", "eighth", "ninth", "tenth",
     "eleventh", "twelfth", "thirteenth", "fourteenth", "fifteenth",
     "sixteenth", "seventeenth", "eighteenth", "nineteenth", "twentieth"
+  )
   # After this, the number (n) is between 20 and 99.
   if( n < 20 ) {
     if( ordinal ) {
       return( .subset( ord_small, n %% 100 ) )
+    }
     return( .subset( small, n %% 100 ) )
+  }
   tens = c( "",
     "twenty", "thirty", "forty", "fifty",
     "sixty", "seventy", "eighty", "ninety"
+  )
   ord_tens = c( "",
     "twentieth", "thirtieth", "fortieth", "fiftieth",
     "sixtieth", "seventieth", "eightieth", "ninetieth"
+  )
   ones_index = n %% 10
   n = n %/% 10
   # No number in the ones column, so the number must be a multiple of ten.
   if( ones_index == 0 ) {
     if( ordinal ) {
       return( .subset( ord_tens, n ) )
+    }
     return( .subset( tens, n ) )
+  }
   # Find the value from the ones column.
   if( ordinal ) {
     unit_1 = .subset( ord_small, ones_index )
+  }
   else {
     unit_1 = .subset( small, ones_index )
+  }
   # Find the tens column.
   unit_10 = .subset( tens, n )
   # Hyphenate the tens and the ones together.
   concat( unit_10, concat( "-", unit_1 ) )
+}
 # Returns a human-readable string that provides the elapsed time between
 # two numbers in terms of years, months, and days. If any unit value is zero,
 # the unit is not included. The words (year, month, day) are pluralized
 # according to English grammar. The numbers are written out according to
 # Chicago Manual of Style. This applies the serial comma.
+#
 # Both numbers are offsets relative to the anchor date.
+#
 # If all unit values are zero, this returns s ("same day" by default).
+#
 # If the start date (began) is greater than end date (ended), the dates are
 # swapped before calculations are performed. This allows any two dates
 # to be compared and positive unit values are always returned.
+#
 elapsed <- function( began, ended, s = "same day" ) {
   began = when( anchor, began )
   ended = when( anchor, ended )
   # Swap the dates if the end date comes before the start date.
   if( as.integer( ended - began ) < 0 ) {
     tempd = began
     began = ended
     ended = tempd
+  }
   # Calculate number of elapsed years.
   years = length( seq( from = began, to = ended, by = 'year' ) ) - 1
   # Move the start date up by the number of elapsed years.
   if( years > 0 ) {
     began = seq( began, length = 2, by = concat( years, " years" ) )[2]
     years = pl.numeric( "year", years )
+  }
   else {
     # Zero years.
     years = ""
+  }
   # Calculate number of elapsed months, excluding years.
   months = length( seq( from = began, to = ended, by = 'month' ) ) - 1
   # Move the start date up by the number of elapsed months
   if( months > 0 ) {
     began = seq( began, length = 2, by = concat( months, " months" ) )[2]
     months = pl.numeric( "month", months )
+  }
   else {
     # Zero months
     months = ""
+  }
   # Calculate number of elapsed days, excluding months and years.
   days = length( seq( from = began, to = ended, by = 'day' ) ) - 1
   if( days > 0 ) {
     days = pl.numeric( "day", days )
+  }
   else {
     # Zero days
     days = ""
+  }
   if( years <= 0 && months <= 0 && days <= 0 ) {
     return( s )
+  }
   # Put them all in a vector, then remove the empty values.
   s <- c( years, months, days )
   s <- s[ s != "" ]
   r <- paste( s, collapse = ", " )
   # If all three items are present, replace the last comma with ", and".
   if( length( s ) > 2 ) {
     return( gsub( "(.*),", "\\1, and", r ) )
+  }
   # Does nothing if no commas are present.
   gsub( "(.*),", "\\1 and", r )
+}
 # Returns the number (n) in English followed by the plural or singular
 # form of the given string (s; resumably a noun), if applicable, according
 # to English grammar. That is, pl.numeric( "wolf", 5 ) will return
 # "five wolves".
 pl.numeric <- function( s, n ) {
   concat( cms( n ), concat( " ", pluralize( s, n ) ) )
+}
 # Name of the season, starting with an capital letter.
 season <- function( n, format = "%Y-%m-%d" ) {
   WS <- as.Date("2016-12-15", "%Y-%m-%d") # Winter Solstice
   SE <- as.Date("2016-03-15", "%Y-%m-%d") # Spring Equinox
   SS <- as.Date("2016-06-15", "%Y-%m-%d") # Summer Solstice
   AE <- as.Date("2016-09-15", "%Y-%m-%d") # Autumn Equinox
   d <- when( anchor, n )
   d <- as.Date( strftime( d, format="2016-%m-%d" ) )
   ifelse( d >= WS | d < SE, "Winter",
     ifelse( d >= SE & d < SS, "Spring",
       ifelse( d >= SS & d < AE, "Summer", "Autumn" )
+    )
+  )
+}
 # Converts the first letter in a string to lowercase
 lc <- function( s ) {
   concat( tolower( substr( s, 1, 1 ) ), substr( s, 2, nchar( s ) ) )
+}
 # Converts the first letter in a string to uppercase
 uc <- function( s ) {
   concat( toupper( substr( s, 1, 1 ) ), substr( s, 2, nchar( s ) ) )
+}
 # Returns the number of days between the given dates.
 days <- function( d1, d2, format = "%Y-%m-%d" ) {
   dates = c( d1, d2 )
   dt = strptime( dates, format = format )
   as.integer( difftime( dates[2], dates[1], units = "days" ) )
+}
 # Returns the number of years elapsed.
 years <- function( began, ended ) {
   began = when( anchor, began )
   ended = when( anchor, ended )
   # Swap the dates if the end date comes before the start date.
   if( as.integer( ended - began ) < 0 ) {
     tempd = began
     began = ended
     ended = tempd
+  }
   # Calculate number of elapsed years.
   length( seq( from = began, to = ended, by = 'year' ) ) - 1
+}
 # Full name of the month, starting with a capital letter.
 month <- function( n ) {
   # Faster than month.name[ x( n ) ]
   .subset( month.name, x( n ) )
+}
 money <- function( n ) {
   formatC( x( n ), format="d" )
+}

A src/main/r/csv.R

 # ######################################################################
+#
 # Copyright 2016, White Magic Software, Ltd.
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 # ######################################################################
 # ######################################################################
+#
 # Converts CSV to Markdown.
+#
 # ######################################################################
 # Reads a CSV file and converts the contents to a Markdown table. The
 # file must be in the working directory as specified by setwd.
+#
 # @param f The filename to convert.
 # @param decimals Rounded decimal places (default 1).
 # @param totals Include total sums (default TRUE).
 # @param align Right-align numbers (default TRUE).
 csv2md <- function( f, decimals = 1, totals = T, align = T ) {
   # Read the CVS data from the file; ensure strings become characters.
   df <- read.table( f, sep=',', header=T, stringsAsFactors=F )
   if( totals ) {
     # Determine what columns can be summed.
     number <- which( unlist( lapply( df, is.numeric ) ) )
     # Use colSums when more than one summable column exists.
     if( length( number ) > 1 ) {
       f.sum <- colSums
+    }
     else {
       f.sum <- sum
+    }
     # Calculate the sum of all the summable columns and insert the
     # results back into the data frame.
     df[ (nrow( df ) + 1), number ] <- f.sum( df[, number], na.rm=TRUE )
     # pluralize would be heavyweight here.
     if( length( number ) > 1 ) {
       t <- "**Totals**"
+    }
     else {
       t <- "**Total**"
+    }
     # Change the first column of the last line to "Total(s)".
     df[ nrow( df ), 1 ] <- t
     # Don't clutter the output with "NA" text.
     df[ is.na( df ) ] <- ""
+  }
   if( align ) {
     is.char <- vapply( df, is.character, logical( 1 ) )
     dashes <- paste( ifelse( is.char, ':---', '---:' ), collapse='|' )
+  }
   else {
     dashes <- paste( rep( '---', length( df ) ), collapse = '|')
+  }
   # Create a Markdown version of the data frame.
   paste(
     paste( names( df ), collapse = '|'), '\n',
     dashes, '\n',
     paste(
       Reduce( function( x, y ) {
           paste( x, format( y, digits = decimals ), sep = '|' )
         }, df
       ),
       collapse = '|\n', sep=''
+    )
+  )
+}

A src/main/r/pluralize.R

 # ######################################################################
+#
 # Copyright 2016, White Magic Software, Ltd.
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 # ######################################################################
 # ######################################################################
+#
 # See Damian Conway's "An Algorithmic Approach to English Pluralization":
 #   http://goo.gl/oRL4MP
 # See Oliver Glerke's Evo Inflector: https://github.com/atteo/evo-inflector/
 # See Shevek's Pluralizer: https://github.com/shevek/linguistics/
 # See also: http://www.freevectors.net/assets/files/plural.txt
+#
 # ######################################################################
 pluralize <- function( s, n ) {
   result <- s
   # Partial implementation of Conway's algorithm for nouns.
   if( n != 1 ) {
     if( pl.noninflective( s ) ||
         pl.suffix( "fish", s ) ||
         pl.suffix( "ois", s ) ||
         pl.suffix( "sheep", s ) ||
         pl.suffix( "deer", s ) ||
         pl.suffix( "pox", s ) ||
         pl.suffix( "[A-Z].*ese", s ) ||
         pl.suffix( "itis", s ) ) {
       # 1. Retain non-inflective user-mapped noun as is.
       # 2. Retain non-inflective plural as is.
       result <- s
+    }
     else if( pl.is.irregular.pl( s ) ) {
       # 4. Change irregular plurals based on mapping.
       result <- pl.irregular.pl( s )
+    }
     else if( pl.is.irregular.es( s ) ) {
       # x. From Shevek's Pluralizer
       result <- pl.inflect( s, "", "es" )
+    }
     else if( pl.suffix( "man", s ) ) {
       # 5. For -man, change -an to -en
       result <- pl.inflect( s, "an", "en" )
+    }
     else if( pl.suffix( "[lm]ouse", s ) ) {
       # 5. For [lm]ouse, change -ouse to -ice
       result <- pl.inflect( s, "ouse", "ice" )
+    }
     else if( pl.suffix( "tooth", s ) ) {
       # 5. For -tooth, change -ooth to -eeth
       result <- pl.inflect( s, "ooth", "eeth" )
+    }
     else if( pl.suffix( "goose", s ) ) {
       # 5. For -goose, change -oose to -eese
       result <- pl.inflect( s, "oose", "eese" )
+    }
     else if( pl.suffix( "foot", s ) ) {
       # 5. For -foot, change -oot to -eet
       result <- pl.inflect( s, "oot", "eet" )
+    }
     else if( pl.suffix( "zoon", s ) ) {
       # 5. For -zoon, change -on to -a
       result <- pl.inflect( s, "on", "a" )
+    }
     else if( pl.suffix( "[csx]is", s ) ) {
       # 5. Change -cis, -sis, -xis to -es
       result <- pl.inflect( s, "is", "es" )
+    }
     else if( pl.suffix( "([cs]h|ss)", s ) ) {
       # 8. Change -ch, -sh, -ss to -es
       result <- pl.inflect( s, "", "es" )
+    }
     else if( pl.suffix( "([aeo]lf|[^d]eaf|arf)", s ) ) {
       # 9. Change -f to -ves
       result <- pl.inflect( s, "f", "ves" )
+    }
     else if( pl.suffix( "[nlw]ife", s ) ) {
       # 9. Change -fe to -ves
       result <- pl.inflect( s, "fe", "ves" )
+    }
     else if( pl.suffix( "([aeiou]y|[A-Z].*y)", s ) ) {
       # 10. Change -y to -ys.
       result <- pl.inflect( s, "", "s" )
+    }
     else if( pl.suffix( "y", s ) ) {
       # 10. Change -y to -ies.
       result <- pl.inflect( s, "y", "ies" )
+    }
     else {
       # 13. Default plural: add -s.
       result <- pl.inflect( s, "", "s" )
+    }
+  }
   result
+}
 # Pluralize s if n is not equal to 1.
 pl <- function( s, n ) {
   pluralize( s, x( n ) )
+}
 # Returns the given string (s) with its suffix replaced by r.
 pl.inflect <- function( s, suffix, r ) {
   gsub( paste( suffix, "$", sep="" ), r, s )
+}
 # Answers whether the given string (s) has the given ending.
 pl.suffix <- function( ending, s ) {
   grepl( paste( ending, "$", sep="" ), s )
+}
 # Answers whether the given string (s) is a noninflective noun.
 pl.noninflective <- function( s ) {
   v <- c(
     "aircraft", "Bhutanese", "bison", "bream", "breeches", "britches",
     "Burmese", "carp", "chassis", "Chinese", "clippers", "cod", "contretemps",
     "corps", "debris", "diabetes", "djinn", "eland", "elk", "flounder",
     "fracas", "gallows", "graffiti", "headquarters", "herpes", "high-jinks",
     "homework", "hovercraft", "innings", "jackanapes", "Japanese",
     "Lebanese", "mackerel", "means", "measles", "mews", "mumps", "news",
     "pincers", "pliers", "Portuguese", "proceedings", "rabies", "salmon",
     "scissors", "sea-bass", "Senegalese", "series", "shears", "Siamese",
     "Sinhalese", "spacecraft", "species", "swine", "trout", "tuna",
     "Vietnamese", "watercraft", "whiting", "wildebeest"
+  )
   is.element( s, v )
+}
 # Answers whether the given string (s) is an irregular plural.
 pl.is.irregular.pl <- function( s ) {
   # Could be refactored with pl.irregular.pl...
   v <- c(
     "beef", "brother", "child", "cow", "ephemeris", "genie", "money",
     "mongoose", "mythos", "octopus", "ox", "soliloquy", "trilby"
+  )
   is.element( s, v )
+}
 # Call to pluralize an irregular noun. Only call after confirming
 # the noun is irregular via pl.is.irregular.pl.
 pl.irregular.pl <- function( s ) {
   v <- list(
     "beef" = "beefs",
     "brother" = "brothers",
     "child" = "children",
     "cow" = "cows",
     "ephemeris" = "ephemerides",
     "genie" = "genies",
     "money" = "moneys",
     "mongoose" = "mongooses",
     "mythos" = "mythoi",
     "octopus" = "octopuses",
     "ox" = "oxen",
     "soliloquy" = "soliloquies",
     "trilby" = "trilbys"
+  )
   # Faster version of v[[ s ]]
   .subset2( v, s )
+}
 # Answers whether the given string (s) pluralizes with -es.
 pl.is.irregular.es <- function( s ) {
   v <- c(
     "acropolis", "aegis", "alias", "asbestos", "bathos", "bias", "bronchitis",
     "bursitis", "caddis", "cannabis", "canvas", "chaos", "cosmos", "dais",
     "digitalis", "epidermis", "ethos", "eyas", "gas", "glottis", "hubris",
     "ibis", "lens", "mantis", "marquis", "metropolis", "pathos", "pelvis",
     "polis", "rhinoceros", "sassafrass", "trellis"
+  )
   is.element( s, v )
+}

A src/main/resources/META-INF/services/com.scrivenvar.service.Options

1
	1	com.scrivenvar.service.impl.DefaultOptions

A src/main/resources/META-INF/services/com.scrivenvar.service.Settings

1
	1	com.scrivenvar.service.impl.DefaultSettings

A src/main/resources/META-INF/services/com.scrivenvar.service.Snitch

1
	1	com.scrivenvar.service.impl.DefaultSnitch

A src/main/resources/META-INF/services/com.scrivenvar.service.events.Notifier

1
	1	com.scrivenvar.service.events.impl.DefaultNotifier

A src/main/resources/com/scrivenvar/.gitignore

	1	app.properties
1	2

A src/main/resources/com/scrivenvar/build.sh

 #!/bin/bash
 INKSCAPE="/usr/bin/inkscape"
 PNG_COMPRESS="optipng"
 PNG_COMPRESS_OPTS="-o9 *png"
 ICO_TOOL="icotool"
 ICO_TOOL_OPTS="-c -o ../../../../../icons/logo.ico logo64.png"
 declare -a SIZES=("16" "32" "64" "128" "256" "512")
 for i in "${SIZES[@]}"; do
   # -y: export background opacity 0
   $INKSCAPE -y 0 -z -f "logo.svg" -w "${i}" -e "logo${i}.png"
 done
 # Compess the PNG images.
 which $PNG_COMPRESS && $PNG_COMPRESS $PNG_COMPRESS_OPTS
 # Generate an ICO file.
 which $ICO_TOOL && $ICO_TOOL $ICO_TOOL_OPTS

A src/main/resources/com/scrivenvar/editor/markdown.css

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 .markdown-editor {
   -fx-font-size: 14px;
+}
 /*---- headers ----*/
 .markdown-editor .h1 { -fx-font-size: 2.25em; }
 .markdown-editor .h2 { -fx-font-size: 1.75em; }
 .markdown-editor .h3 { -fx-font-size: 1.5em; }
 .markdown-editor .h4 { -fx-font-size: 1.25em; }
 .markdown-editor .h5 { -fx-font-size: 1.1em; }
 .markdown-editor .h6 { -fx-font-size: 1em; }
 .markdown-editor .h1,
 .markdown-editor .h2,
 .markdown-editor .h3,
 .markdown-editor .h4,
 .markdown-editor .h5,
 .markdown-editor .h6 {
   -fx-font-weight: bold;
   -fx-fill: derive(crimson, -20%);
+}
 /*---- inlines ----*/
 .markdown-editor .strong {
   -fx-font-weight: bold;
+}
 .markdown-editor .em {
   -fx-font-style: italic;
+}
 .markdown-editor .del {
   -fx-strikethrough: true;
+}
 .markdown-editor .a {
   -fx-fill: #4183C4 !important;
+}
 .markdown-editor .img {
   -fx-fill: #4183C4 !important;
+}
 .markdown-editor .code {
   -fx-font-family: monospace;
   -fx-fill: #090 !important;
+}
 /*---- blocks ----*/
 .markdown-editor .pre {
   -fx-font-family: monospace;
   -fx-fill: #060 !important;
+}
 .markdown-editor .blockquote {
   -fx-fill: #777;
+}
 /*---- lists ----*/
 .markdown-editor .ul {
+}
 .markdown-editor .ol {
+}
 .markdown-editor .li {
   -fx-fill: #444;
+}
 .markdown-editor .dl {
+}
 .markdown-editor .dt {
   -fx-font-weight: bold;
   -fx-font-style: italic;
+}
 .markdown-editor .dd {
   -fx-fill: #444;
+}
 /*---- table ----*/
 .markdown-editor .table {
   -fx-font-family: monospace;
+}
 .markdown-editor .thead {
+}
 .markdown-editor .tbody {
+}
 .markdown-editor .caption {
+}
 .markdown-editor .th {
   -fx-font-weight: bold;
+}
 .markdown-editor .tr {
+}
 .markdown-editor .td {
+}
 /*---- misc ----*/
 .markdown-editor .html {
   -fx-font-family: monospace;
   -fx-fill: derive(crimson, -50%);
+}
 .markdown-editor .monospace {
   -fx-font-family: monospace;
+}

A src/main/resources/com/scrivenvar/logo.svg

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
    width="512"
    height="512"
    viewBox="0 0 512 512"
    sodipodi:docname="logo.svg">
   <metadata
      id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs6" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
      gridtolerance="10"
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="640"
      inkscape:window-height="480"
      id="namedview4"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="1.2682274"
      inkscape:cx="15.646213"
      inkscape:cy="213.34955"
      inkscape:current-layer="svg2" />
   <path
      style="fill:#ce6200;fill-opacity:1"
      d="m 203.2244,511.85078 c -60.01827,-1.2968 -121.688643,-6.5314 -192.436493,-16.334 -5.8078027,-0.8047 -10.66110747,-1.561 -10.78511762,-1.6806 -0.12404567,-0.1196 3.90488112,-4.5812 8.95313512,-9.9147 32.9484785,-34.8102 70.4314485,-73.8923 104.1521555,-108.5956 l 11.87611,-12.2221 5.48905,-10.2177 c 35.82801,-66.6927 75.13064,-128.5665 105.90637,-166.7277 6.13805,-7.611 10.21451,-12.0689 17.28719,-18.9048 36.6818,-35.4537 108.27279,-83.724003 206.0323,-138.917303 22.10365,-12.47935 51.93386,-28.64995037 52.26391,-28.33165037 0.38883,0.37499 -2.35932,25.95575037 -4.86585,45.29275037 -7.28943,56.236403 -17.04619,103.128903 -28.07642,134.939803 -7.19617,20.7536 -14.81287,35.152 -22.9667,43.4155 -3.60444,3.6529 -6.58328,5.7941 -10.1313,7.2825 l -2.56414,1.0756 -53.43164,0.1713 -53.43166,0.1713 3.69973,1.8547 c 26.78565,13.4282 52.58051,27.5241 59.57122,32.5533 4.48397,3.2259 4.41278,2.9854 1.59124,5.3784 -26.99514,22.8955 -74.52961,44.0013 -140.23089,62.2641 -26.34995,7.3244 -57.85469,14.6842 -86.99871,20.3237 l -10.26943,1.9871 -52.01052,53.2733 -52.010524,53.2732 -29.459801,15.1165 c -26.4100885,13.5517 -29.3446639,15.1388 -28.347645,15.3311 0.6117029,0.118 4.0894221,0.2188 7.7282726,0.2239 3.6388854,0.01 16.1273694,0.2329 27.7522124,0.5059 51.576376,1.2116 146.083985,1.512 170.154295,0.5409 34.66996,-1.3988 52.7606,-2.9325 67.58258,-5.7293 2.68664,-0.507 4.82907,-0.9755 4.76094,-1.0412 -0.0681,-0.066 -3.24733,-0.8833 -7.0649,-1.8169 -8.04133,-1.9664 -25.10167,-5.3107 -41.1231,-8.0612 -47.6405,-8.1787 -65.48708,-12.0107 -74.13028,-15.9169 -3.90548,-1.7651 -7.13816,-4.7659 -8.12937,-7.5463 -1.01822,-2.8562 -0.92214,-6.5271 0.23315,-8.9083 1.86563,-3.8451 6.14837,-6.7199 12.26745,-8.2345 16.96993,-4.2004 57.27977,-6.1832 90.36228,-4.4448 54.7332,2.8761 117.0767,13.1228 178.50212,29.3385 18.03514,4.7611 51.66065,14.656 51.22677,15.0744 -0.0824,0.08 -5.72762,-0.854 -12.54488,-2.0745 -40.1043,-7.18 -60.50854,-10.2888 -101.40822,-15.4507 -24.4851,-3.0902 -55.12614,-5.9915 -77.58876,-7.3465 -26.58826,-1.6039 -61.15821,-1.7754 -80.99202,-0.4019 l -3.19705,0.2214 8.70308,1.4934 c 51.89698,8.9047 77.51746,14.9877 88.00479,20.8948 6.9134,3.894 10.30497,9.4381 9.33333,15.2569 -1.50397,9.0066 -10.51381,14.0257 -32.00273,17.8278 -16.31374,2.8863 -47.27575,4.3845 -77.23553,3.7371 z"
      id="path4138" />
   <path
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
      d="m 214.76931,324.51908 c 60.83777,-14.1145 111.89562,-31.6251 144.40025,-49.5229 3.12602,-1.7213 5.81747,-3.2537 5.98106,-3.4054 0.40534,-0.3759 -13.76388,-7.9415 -34.63489,-18.4929 -7.52161,-3.8026 -9.82337,-5.3787 -12.0735,-8.2668 -5.14485,-6.6036 -5.96081,-14.8404 -2.20331,-22.2417 1.80288,-3.5512 5.69484,-7.3007 9.36158,-9.019 5.20851,-2.4407 1.18148,-2.2865 59.71223,-2.2865 l 52.81361,0 2.13233,-2.1984 c 2.78673,-2.8731 5.23414,-6.4981 8.23035,-12.1905 14.14966,-26.8827 26.71842,-78.3816 36.24347,-148.503303 0.76704,-5.6468 1.36194,-10.2983 1.32201,-10.3369 -0.0399,-0.038 -5.47754,2.9629 -12.08361,6.6697 l -12.01104,6.7396 -133.83068,137.037303 c -73.60688,75.3705 -134.81732,138.0567 -136.0232,139.3026 l -2.19251,2.2653 8.254,-1.8067 c 4.53969,-0.9937 12.01053,-2.6783 16.60185,-3.7435 z"
      id="path4136" />
   <path
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
      d="m 202.72524,284.43588 c 69.93294,-70.1332 135.4799,-131.9279 213.46406,-201.244203 7.71421,-6.8568 14.50542,-12.9341 15.09155,-13.5052 0.9482,-0.9239 0.96778,-0.9811 0.17761,-0.5188 -77.96496,45.611803 -139.23519,88.710503 -166.72539,117.278203 -18.81811,19.5556 -50.35654,64.861 -80.96704,116.3104 -0.91787,1.5427 1.02249,-0.3323 18.95921,-18.3204 z"
      id="path4142" />
   <path
      style="fill:#000000"
      d=""
      id="path4140"
      inkscape:connector-curvature="0" />
 </svg>

A src/main/resources/com/scrivenvar/logo128.png

Binary file

A src/main/resources/com/scrivenvar/logo16.png

Binary file

A src/main/resources/com/scrivenvar/logo256.png

Binary file

A src/main/resources/com/scrivenvar/logo32.png

Binary file

A src/main/resources/com/scrivenvar/logo512.png

Binary file

A src/main/resources/com/scrivenvar/logo64.png

Binary file

A src/main/resources/com/scrivenvar/messages.properties

 # ########################################################################
 # Main Application Window
 # ########################################################################
 # The application title should exist only once in the entire code base.
 # All other references should either refer to this value via the Messages
 # class, or indirectly using ${Main.title}.
 Main.title=Scrivenvar
 Main.menu.file=_File
 Main.menu.file.new=_New
 Main.menu.file.open=_Open...
 Main.menu.file.close=_Close
 Main.menu.file.close_all=Close All
 Main.menu.file.save=_Save
 Main.menu.file.save_as=Save _As
 Main.menu.file.save_all=Save A_ll
 Main.menu.file.exit=E_xit
 Main.menu.edit=_Edit
 Main.menu.edit.undo=_Undo
 Main.menu.edit.redo=_Redo
 Main.menu.edit.find=_Find
 Main.menu.edit.find.next=Find _Next
 Main.menu.edit.preferences=_Preferences
 Main.menu.insert=_Insert
 Main.menu.insert.bold=Bold
 Main.menu.insert.italic=Italic
 Main.menu.insert.superscript=Superscript
 Main.menu.insert.subscript=Subscript
 Main.menu.insert.strikethrough=Strikethrough
 Main.menu.insert.blockquote=Blockquote
 Main.menu.insert.code=Inline Code
 Main.menu.insert.fenced_code_block=Fenced Code Block
 Main.menu.insert.fenced_code_block.prompt=Enter code here
 Main.menu.insert.link=Link...
 Main.menu.insert.image=Image...
 Main.menu.insert.header.1=Header 1
 Main.menu.insert.header.1.prompt=header 1
 Main.menu.insert.header.2=Header 2
 Main.menu.insert.header.2.prompt=header 2
 Main.menu.insert.header.3=Header 3
 Main.menu.insert.header.3.prompt=header 3
 Main.menu.insert.unordered_list=Unordered List
 Main.menu.insert.ordered_list=Ordered List
 Main.menu.insert.horizontal_rule=Horizontal Rule
 Main.menu.help=_Help
 Main.menu.help.about=About ${Main.title}
 # ########################################################################
 # Status Bar
 # ########################################################################
 Main.statusbar.text.offset=offset
 Main.statusbar.line=Line {0} of {1}, ${Main.statusbar.text.offset} {2}
 Main.statusbar.state.default=OK
 Main.statusbar.parse.error={0} (near ${Main.statusbar.text.offset} {1})
 # ########################################################################
 # Preferences
 # ########################################################################
 Preferences.r=R
 Preferences.r.script=Startup Script
 Preferences.r.script.desc=Script runs prior to executing R statements within the document.
 Preferences.r.directory=Working Directory
 Preferences.r.directory.desc=Value assigned to $application.r.working.directory$ and usable in the startup script.
 Preferences.images=Images
 Preferences.images.directory=Relative Directory
 Preferences.images.directory.desc=Path prepended to embedded images referenced using local file paths.
 Preferences.images.suffixes=Extensions
 Preferences.images.suffixes.desc=Preferred order of image file types to embed, separated by spaces.
 Preferences.definitions=Definitions
 Preferences.definitions.path=File name
 Preferences.definitions.path.desc=Absolute path to interpolated string definitions.
 # ########################################################################
 # Definition Pane and its Tree View
 # ########################################################################
 Definition.menu.create=Create
 Definition.menu.rename=Rename
 Definition.menu.remove=Delete
 Definition.menu.add.default=Undefined
 # ########################################################################
 # Failure messages with respect to YAML files.
 # ########################################################################
 yaml.error.open=Could not open YAML file (ensure non-empty file).
 yaml.error.unresolvable=Too much indirection for: ''{0}'' = ''{1}''.
 yaml.error.missing=Empty definition value for key ''{0}''.
 yaml.error.tree.form=Unassigned definition near ''{0}''.
 # ########################################################################
 # File Editor
 # ########################################################################
 FileEditor.loadFailed.message=Failed to load ''{0}''.\n\nReason: {1}
 FileEditor.loadFailed.title=Load
 FileEditor.loadFailed.reason.permissions=File must be readable and writable.
 FileEditor.saveFailed.message=Failed to save ''{0}''.\n\nReason: {1}
 FileEditor.saveFailed.title=Save
 # ########################################################################
 # File Open
 # ########################################################################
 Dialog.file.choose.open.title=Open File
 Dialog.file.choose.save.title=Save File
 Dialog.file.choose.filter.title.source=Source Files
 Dialog.file.choose.filter.title.definition=Definition Files
 Dialog.file.choose.filter.title.xml=XML Files
 Dialog.file.choose.filter.title.all=All Files
 # ########################################################################
 # Alert Dialog
 # ########################################################################
 Alert.file.close.title=Close
 Alert.file.close.text=Save changes to {0}?
 # ########################################################################
 # Definition Pane
 # ########################################################################
 Pane.definition.node.root.title=Definitions
 # Controls ###############################################################
 # ########################################################################
 # Browse Directory
 # ########################################################################
 BrowseDirectoryButton.chooser.title=Browse for local folder
 BrowseDirectoryButton.tooltip=${BrowseDirectoryButton.chooser.title}
 # ########################################################################
 # Browse File
 # ########################################################################
 BrowseFileButton.chooser.title=Browse for local file
 BrowseFileButton.chooser.allFilesFilter=All Files
 BrowseFileButton.tooltip=${BrowseFileButton.chooser.title}
 # Dialogs ################################################################
 # ########################################################################
 # Image
 # ########################################################################
 Dialog.image.title=Image
 Dialog.image.chooser.imagesFilter=Images
 Dialog.image.previewLabel.text=Markdown Preview\:
 Dialog.image.textLabel.text=Alternate Text\:
 Dialog.image.titleLabel.text=Title (tooltip)\:
 Dialog.image.urlLabel.text=Image URL\:
 # ########################################################################
 # Hyperlink
 # ########################################################################
 Dialog.link.title=Link
 Dialog.link.previewLabel.text=Markdown Preview\:
 Dialog.link.textLabel.text=Link Text\:
 Dialog.link.titleLabel.text=Title (tooltip)\:
 Dialog.link.urlLabel.text=Link URL\:
 # ########################################################################
 # About
 # ########################################################################
 Dialog.about.title=About
 Dialog.about.header=${Main.title}
 Dialog.about.content=Copyright 2020 White Magic Software, Ltd.\n\nBased on Markdown Writer FX by Karl Tauber
 # Options ################################################################
 # ########################################################################
 # Options Dialog
 # ########################################################################
 OptionsDialog.title=Options
 OptionsDialog.generalTab.text=General
 OptionsDialog.markdownTab.text=Markdown
 # ########################################################################
 # General Options Pane
 # ########################################################################
 GeneralOptionsPane.encodingLabel.text=En_coding\:
 GeneralOptionsPane.lineSeparatorLabel.text=_Line separator\:
 GeneralOptionsPane.lineSeparatorLabel2.text=(applies to new files only)
 GeneralOptionsPane.platformDefault=Platform Default ({0})
 GeneralOptionsPane.sepWindows=Windows (CRLF)
 GeneralOptionsPane.sepUnix=Unix (LF)
 # ########################################################################
 # Markdown Options Pane
 # ########################################################################
 MarkdownOptionsPane.abbreviationsExtCheckBox.text=A_bbreviations in the way of
 MarkdownOptionsPane.abbreviationsExtLink.text=Markdown Extra
 MarkdownOptionsPane.anchorlinksExtCheckBox.text=_Anchor links in headers
 MarkdownOptionsPane.atxHeaderSpaceExtCheckBox.text=Requires a space char after Atx \# header prefixes, so that \#dasdsdaf is not a header
 MarkdownOptionsPane.autolinksExtCheckBox.text=_Plain (undelimited) autolinks in the way of
 MarkdownOptionsPane.autolinksExtLink.text=Github-flavoured-Markdown
 MarkdownOptionsPane.definitionListsExtCheckBox.text=_Definition lists in the way of
 MarkdownOptionsPane.definitionListsExtLink.text=Markdown Extra
 MarkdownOptionsPane.extAnchorLinksExtCheckBox.text=Generate anchor links for headers using complete contents of the header
 MarkdownOptionsPane.fencedCodeBlocksExtCheckBox.text=_Fenced Code Blocks in the way of
 MarkdownOptionsPane.fencedCodeBlocksExtLabel.text=or
 MarkdownOptionsPane.fencedCodeBlocksExtLink.text=Markdown Extra
 MarkdownOptionsPane.fencedCodeBlocksExtLink2.text=Github-flavoured-Markdown
 MarkdownOptionsPane.forceListItemParaExtCheckBox.text=Force List and Definition Paragraph wrapping if it includes more than just a single paragraph
 MarkdownOptionsPane.hardwrapsExtCheckBox.text=_Newlines in paragraph-like content as real line breaks, see
 MarkdownOptionsPane.hardwrapsExtLink.text=Github-flavoured-Markdown
 MarkdownOptionsPane.quotesExtCheckBox.text=Beautify single _quotes, double quotes and double angle quotes (\u00ab and \u00bb)
 MarkdownOptionsPane.relaxedHrRulesExtCheckBox.text=Allow horizontal rules without a blank line following them
 MarkdownOptionsPane.smartsExtCheckBox.text=Beautify apostrophes, _ellipses ("..." and ". . .") and dashes ("--" and "---")
 MarkdownOptionsPane.strikethroughExtCheckBox.text=_Strikethrough
 MarkdownOptionsPane.suppressHtmlBlocksExtCheckBox.text=Suppress the _output of HTML blocks
 MarkdownOptionsPane.suppressInlineHtmlExtCheckBox.text=Suppress the o_utput of inline HTML elements
 MarkdownOptionsPane.tablesExtCheckBox.text=_Tables similar to
 MarkdownOptionsPane.tablesExtLabel.text=(like
 MarkdownOptionsPane.tablesExtLabel2.text=tables, but with colspan support)
 MarkdownOptionsPane.tablesExtLink.text=MultiMarkdown
 MarkdownOptionsPane.tablesExtLink2.text=Markdown Extra
 MarkdownOptionsPane.taskListItemsExtCheckBox.text=GitHub style task list items
 MarkdownOptionsPane.wikilinksExtCheckBox.text=_Wiki-style links ("[[wiki link]]")

A src/main/resources/com/scrivenvar/preview/webview.css

 /*
 This software is released under the MIT license:
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 /* Source: https://github.com/nicolashery/markdownpad-github */
 /*  GitHub stylesheet for MarkdownPad (http://markdownpad.com) */
 /* RESET
 =============================================================================*/
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6,
 p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn,
 em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var,
 b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label,
 legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas,
 details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output,
 ruby, section, summary, time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
+}
 /* BODY
 =============================================================================*/
 body {
   font-family: serif;
   font-size: 14px;
   line-height: 1.6;
   color: #333;
   background-color: #fff;
   padding: 20px;
   max-width: 960px;
   margin: 0 auto;
+}
 body>*:first-child {
   margin-top: 0 !important;
+}
 body>*:last-child {
   margin-bottom: 0 !important;
+}
 /* BLOCKS
 =============================================================================*/
 p, blockquote, ul, ol, dl, table, pre {
   margin: 15px 0;
+}
 /* HEADERS
 =============================================================================*/
 h1, h2, h3, h4, h5, h6 {
   margin: 20px 0 10px;
   padding: 0;
   font-weight: bold;
   -webkit-font-smoothing: antialiased;
+}
 h1 tt, h1 code, h2 tt, h2 code, h3 tt, h3 code,
 h4 tt, h4 code, h5 tt, h5 code, h6 tt, h6 code {
   font-size: inherit;
+}
 h1 {
   font-size: 28px;
   color: #000;
+}
 h2 {
   font-size: 24px;
   border-bottom: 1px solid #ccc;
   color: #000;
+}
 h3 {
   font-size: 18px;
+}
 h4 {
   font-size: 16px;
+}
 h5 {
   font-size: 14px;
+}
 h6 {
   color: #777;
   font-size: 14px;
+}
 body>h2:first-child, body>h1:first-child, body>h1:first-child+h2,
 body>h3:first-child, body>h4:first-child, body>h5:first-child,
 body>h6:first-child {
   margin-top: 0;
   padding-top: 0;
+}
 a:first-child h1, a:first-child h2, a:first-child h3,
 a:first-child h4, a:first-child h5, a:first-child h6 {
   margin-top: 0;
   padding-top: 0;
+}
 h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
   margin-top: 10px;
+}
 /* LINKS
 =============================================================================*/
 a {
   color: #4183C4;
   text-decoration: none;
+}
 a:hover {
   text-decoration: underline;
+}
 /* LISTS
 =============================================================================*/
 ul, ol {
   padding-left: 30px;
+}
 ul li > :first-child,
 ol li > :first-child,
 ul li ul:first-of-type,
 ol li ol:first-of-type,
 ul li ol:first-of-type,
 ol li ul:first-of-type {
   margin-top: 0px;
+}
 ul ul, ul ol, ol ol, ol ul {
   margin-bottom: 0;
+}
 dl {
   padding: 0;
+}
 dl dt {
   font-size: 14px;
   font-weight: bold;
   font-style: italic;
   padding: 0;
   margin: 15px 0 5px;
+}
 dl dt:first-child {
   padding: 0;
+}
 dl dt>:first-child {
   margin-top: 0px;
+}
 dl dt>:last-child {
   margin-bottom: 0px;
+}
 dl dd {
   margin: 0 0 15px;
   padding: 0 15px;
+}
 dl dd>:first-child {
   margin-top: 0px;
+}
 dl dd>:last-child {
   margin-bottom: 0px;
+}
 /* CODE
 =============================================================================*/
 pre, code, tt {
   font-size: 12px;
   font-family: Consolas, "Liberation Mono", Courier, monospace;
+}
 code, tt {
   margin: 0 0px;
   padding: 0px 0px;
   white-space: nowrap;
   border: 1px solid #eaeaea;
   background-color: #f8f8f8;
   border-radius: 3px;
+}
 pre>code {
   margin: 0;
   padding: 0;
   white-space: pre;
   border: none;
   background: transparent;
+}
 pre {
   background-color: #f8f8f8;
   border: 1px solid #ccc;
   font-size: 13px;
   line-height: 19px;
   overflow: auto;
   padding: 6px 10px;
   border-radius: 3px;
+}
 pre code, pre tt {
   background-color: transparent;
   border: none;
+}
 kbd {
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;
   -moz-border-right-colors: none;
   -moz-border-top-colors: none;
   background-color: #DDDDDD;
   background-image: linear-gradient(#F1F1F1, #DDDDDD);
   background-repeat: repeat-x;
   border-color: #DDDDDD #CCCCCC #CCCCCC #DDDDDD;
   border-image: none;
   border-radius: 2px 2px 2px 2px;
   border-style: solid;
   border-width: 1px;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   line-height: 10px;
   padding: 1px 4px;
+}
 /* QUOTES
 =============================================================================*/
 blockquote {
   border-left: 4px solid #DDD;
   padding: 0 15px;
   color: #777;
+}
 blockquote>:first-child {
   margin-top: 0px;
+}
 blockquote>:last-child {
   margin-bottom: 0px;
+}
 /* HORIZONTAL RULES
 =============================================================================*/
 hr {
   clear: both;
   margin: 15px 0;
   height: 0px;
   overflow: hidden;
   border: none;
   background: transparent;
   border-bottom: 4px solid #ddd;
   padding: 0;
+}
 /* TABLES
 =============================================================================*/
 table th {
   font-weight: bold;
+}
 table th, table td {
   border: 1px solid #ccc;
   padding: 6px 13px;
+}
 table tr {
   border-top: 1px solid #ccc;
   background-color: #fff;
+}
 table tr:nth-child(2n) {
   background-color: #f8f8f8;
+}
 /* IMAGES
 =============================================================================*/
 img {
   max-width: 100%
+}

A src/main/resources/com/scrivenvar/scene.css

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---- toolbar ----*/
 .tool-bar {
 	-fx-spacing: 0;
+}
 .tool-bar .button {
 	-fx-background-color: transparent;
+}
 .tool-bar .button:hover {
 	-fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
 	-fx-color: -fx-hover-base;
+}
 .tool-bar .button:armed {
 	-fx-color: -fx-pressed-base;
+}

A src/main/resources/com/scrivenvar/settings.properties

 # ########################################################################
 # Application
 # ########################################################################
 application.title=scrivenvar
 application.package=com/${application.title}
 application.messages= com.${application.title}.messages
 # Suppress multiple file modified notifications for one logical modification.
 # Given in milliseconds.
 application.watchdog.timeout=50
 # ########################################################################
 # Preferences
 # ########################################################################
 preferences.root=com.${application.title}
 preferences.root.state=state
 preferences.root.options=options
 preferences.root.definition.source=definition.source
 # ########################################################################
 # File and Path References
 # ########################################################################
 file.stylesheet.scene=${application.package}/scene.css
 file.stylesheet.markdown=${application.package}/editor/markdown.css
 file.stylesheet.preview=webview.css
 file.stylesheet.xml=${application.package}/xml.css
 file.logo.16 =${application.package}/logo16.png
 file.logo.32 =${application.package}/logo32.png
 file.logo.128=${application.package}/logo128.png
 file.logo.256=${application.package}/logo256.png
 file.logo.512=${application.package}/logo512.png
 # Default file name when a new file is created.
 # This ensures that the file type can always be
 # discerned so that the correct type of variable
 # reference can be inserted.
 file.default=untitled.md
 file.definition.default=variables.yaml
 # ########################################################################
 # File name Extensions
 # ########################################################################
 # Comma-separated list of definition file name extensions.
 definition.file.ext.json=*.json
 definition.file.ext.toml=*.toml
 definition.file.ext.yaml=*.yml,*.yaml
 definition.file.ext.properties=*.properties,*.props
 # Comma-separated list of file name extensions.
 file.ext.rmarkdown=*.Rmd
 file.ext.rxml=*.Rxml
 file.ext.source=*.md,*.markdown,*.mkdown,*.mdown,*.mkdn,*.mkd,*.mdwn,*.mdtxt,*.mdtext,*.text,*.txt,${file.ext.rmarkdown},${file.ext.rxml}
 file.ext.definition=${definition.file.ext.yaml}
 file.ext.xml=*.xml,${file.ext.rxml}
 file.ext.all=*.*
 # File name extension search order for images.
 file.ext.image.order=svg pdf png jpg tiff
 # ########################################################################
 # Variable Name Editor
 # ########################################################################
 # Maximum number of characters for a variable name. A variable is defined
 # as one or more non-whitespace characters up to this maximum length.
 editor.variable.maxLength=256
 # ########################################################################
 # Dialog Preferences
 # ########################################################################
 dialog.alert.button.order.mac=L_HE+U+FBIX_NCYOA_R
 dialog.alert.button.order.linux=L_HE+UNYACBXIO_R
 dialog.alert.button.order.windows=L_E+U+FBXI_YNOCAH_R
 # Ensures a consistent button order for alert dialogs across platforms (because
 # the default button order on Linux defies all logic).
 dialog.alert.button.order=${dialog.alert.button.order.windows}

A src/main/resources/com/scrivenvar/variables.yaml

 ---
 c:
   protagonist:
     name:
       First: Chloe
       First_pos: $c.protagonist.name.First$'s
       Middle: Irene
       Family: Angelos
       nick:
         Father: Savant
         Mother: Sweetie
     colour:
       eyes: green
       hair: dark auburn
       syn_1: black
       syn_2: purple
       syn_11: teal
       syn_6: silver
       favourite: emerald green
     speech:
       tic: oh
     father:
       heritage: Greek
       name:
         Short: Bryce
         First: Bryson
         First_pos: $c.protagonist.father.name.First$'s
         Honourific: Mr.
       education: Masters
       vocation:
         name: robotics
         title: roboticist
       employer:
         name:
           Short: Rabota
           Full: $c.protagonist.father.employer.name.Short$ Designs
       hair:
         style: thick, curly
         colour: black
       eyes:
         colour: dark brown
       Endear: Dad
       vehicle: coupé
     mother:
       name:
         Short: Cass
         First: Cassandra
         First_pos: $c.protagonist.mother.name.First$'s
         Honourific: Mrs.
       education: PhD
       speech:
         tic: cute
         Honorific: Doctor
       vocation:
         article: an
         name: oceanography
         title: oceanographer
       employer:
         name:
           Full: Oregon State University
           Short: OSU
       eyes:
         colour: blue
       hair:
         style: thick, curly
         colour: dark brown
       Endear: Mom
       Endear_pos: Mom's
     uncle:
       name:
         First: Damian
         First_pos: $c.protagonist.uncle.name.First$'s
         Family: Moros
       hands:
         fingers:
           shape: long, bony
     friend:
       primary:
         name:
           First: Gerard
           First_pos: $c.protagonist.friend.primary.name.First$'s
           Family: Baran
           Family_pos: $c.protagonist.friend.primary.name.Family$'s
         favourite:
           colour: midnight blue
         eyes:
           colour: hazel
         mother:
           name:
             First: Isabella
             Short: Izzy
             Honourific: Mrs.
         father:
           name:
             Short: Mo
             First: Montgomery
             First_pos: $c.protagonist.friend.primary.father.name.First$'s
             Honourific: Mr.
           speech:
             tic: y'know
           endear: Pops
   military:
     primary:
       name:
         First: Felix
         Family: LeMay
         Family_pos: LeMay's
       rank:
         Short: General
         Full: Brigadier $c.military.primary.rank.Short$
       colour:
         eyes: gray
         hair: dirty brown
     secondary:
       name:
         Family: Grell
       rank: Colonel
       colour:
         eyes: green
         hair: deep red
     quaternary:
       name:
         First: Gretchen
         Family: Steinherz
   minor:
     primary:
       name:
         First: River
         Family: Banks
         Honourific: Mx.
       vocation:
         title: salesperson
       employer:
         Name: Geophysical Prospecting Incorporated
         Abbr: GPI
         Area: Cold Spring Creek
         payment: twenty million
     secondary:
       name:
         First: Renato
         Middle: Carroña
         Family: Salvatierra
         Family_pos: $c.minor.secondary.name.Family$'s
         Full: $c.minor.secondary.name.First$ $c.minor.secondary.name.Middle$ Alejandro Gregorio Eduardo Salomón Vidal $c.minor.secondary.name.Family$
         Honourific: Mister
         Honourific_sp: Señor
       vocation:
         title: detective
     tertiary:
       name:
         First: Robert
         Family: Hanssen
   ai:
     protagonist:
       name:
         first: yoky
         First: Yoky
         First_pos: $c.ai.protagonist.name.First$'s
         Family: Tsukuda
         id: 46692
       persona:
         name:
           First: Hoshi
           First_pos: $c.ai.protagonist.persona.name.First$'s
           Family: Yamamoto
           Family_pos: $c.ai.protagonist.persona.name.Family$'s
       culture: Japanese-American
       ethnicity: Asian
       rank: Technical Sergeant
       speech:
         tic: okay
     first:
       Name: Prôtos
       Name_pos: Prôtos'
       age:
         actual: twenty-six weeks
         virtual: five years
     second:
       Name: Défteros
     third:
       Name: Trítos
     fourth:
       Name: Tétartos
     material:
       type: metal
       raw: ilmenite
       extract: ore
       name:
         short: titanium
         long: $c.ai.material.name.short$ dioxide
         Abbr: TiO~2~
       pejorative: tin
   animal:
     protagonist:
       Name: Trufflers
       type: pig
     antagonist:
       name: coywolf
       Name: Coywolf
       plural: coywolves
 narrator:
   one: (by $c.protagonist.father.name.First$ $c.protagonist.name.Family$)
   two: (by $c.protagonist.mother.name.First$ $c.protagonist.name.Family$)
 military:
   name:
     Short: Agency
     Short_pos: $military.name.Short$'s
     plural: agencies
   machine:
     Name: Skopós
     Name_pos: $military.machine.Name$'
     Location: Arctic
     predictor: quantum chips
   land:
     name:
       Full: $military.name.Short$ of Defence
     Slogan: Safety in Numbers
   air:
     name:
       Full: $military.name.Short$ of Air
   compound:
     type: base
     lights:
       colour: blue
     nick:
       Prefix: Catacombs
       prep: of
       Suffix: Tartarus
 government:
   Country: United States
 location:
   protagonist:
     City: Corvallis
     Region: Oregon
     Geography: Willamette Valley
     secondary:
       City: Willow Branch Spring
       Region: Oregon
       Geography: Wheeler County
       Water: Clarno Rapids
       Road: Shaniko-Fossil Highway
     tertiary:
       City: Leavenworth
       Region: Washington
       Type: Bavarian village
     school:
       address: 1400 Northwest Buchanan Avenue
     hospital:
       Name: Good Samaritan Regional Medical Center
   ai:
     escape:
       country:
         Name: Ecuador
         Name_pos: Ecuador's
       mountain:
         Name: Chimborazo
 language:
   ai:
     article: an
     singular: exanimis
     plural: exanimēs
     brain:
       singular: superum
       plural: supera
     title: memristor array
     Title: Memristor Array
   police:
     slang:
       singular: mippo
       plural: $language.police.slang.singular$s
 date:
   anchor: 2042-09-02
   protagonist:
     born: 0
     conceived: -243
     attacked:
       first: 2192
       second: 8064
     father:
       attacked:
         first: -8205
       date:
         second: -1550
     family:
       moved:
         first: $date.protagonist.conceived$ + 35
   game:
     played:
       first: $date.protagonist.born$ - 672
       second: $date.protagonist.family.moved.first$ + 2
   ai:
     interviewed: 6198
     onboarded: $date.ai.interviewed$ + 290
     diagnosed: $date.ai.onboarded$ + 2
     resigned: $date.ai.diagnosed$ + 3
     trapped: $date.ai.resigned$ + 26
     torturer: $date.ai.trapped$ + 18
     memristor: $date.ai.torturer$ + 61
     ethics: $date.ai.memristor$ + 415
     trained: $date.ai.ethics$ + 385
     mindjacked: $date.ai.trained$ + 22
     bombed: $date.ai.mindjacked$ + 458
   military:
     machine:
       Construction: Six years
 plot:
   Log: $c.ai.protagonist.name.First_pos$ Chronicles
   Channel: Quantum Channel
   device:
     computer:
       Name: Tau
     network:
       Name: Internet
     paper:
       name:
         full: electronic sheet
         short: sheet
     typewriter:
       Name: Underwood
       year: nineteen twenties
       room: root cellar
     portable:
       name: nanobook
     vehicle:
       name: robocars
       Name: Robocars
     sensor:
       name: BMP1580
     phone:
       name: comm
       name_pos: $plot.device.phone.name$'s
       Name: Comm
       plural: $plot.device.phone.name$s
     video:
       name: vidfeed
       plural: $plot.device.video.name$s
     game:
       Name: Psynæris
       thought: transed
       machine: telecognos
       location:
         Building: Nijō Castle
         District: Gion
         City: Kyoto
         Country: Japan
 farm:
   population:
     estimate: 350
     actual: 1,000
   energy: 9800kJ
   width: 55m
   length: 55m
   storeys: 10
 lamp:
   height: 0.17m
   length: 1.22m
   width: 0.28m
 crop:
   name:
     singular: tomato
     plural: $crop.name.singular$es
   energy: 318kJ
   weight: 450g
   yield: 50
   harvests: 7
   diameter: 2m
   height: 1.5m
 heading:
   ch_01: Till
   ch_02: Sow
   ch_03: Seed
   ch_04: Germinate
   ch_05: Grow
   ch_06: Shoot
   ch_07: Bud
   ch_08: Bloom
   ch_09: Pollinate
   ch_10: Fruit
   ch_11: Harvest
   ch_12: Deliver
   ch_13: Spoil
   ch_14: Revolt
   ch_15: Compost
   ch_16: Burn
   ch_17: Release
   ch_18: End Notes
   ch_19: Characters
 inference:
   unit: per cent
   min: two
   ch_sow: eighty
   ch_seed: fifty-two
   ch_germinate: thirty-one
   ch_grow: fifteen
   ch_shoot: seven
   ch_bloom: four
   ch_pollinate: two
   ch_harvest: ninety-five
   ch_delivery: ninety-eight
 link:
   tartarus: https://en.wikipedia.org/wiki/Tartarus
   exploits: https://www.google.ca/search?q=inurl:ftp+password+filetype:xls
   atalanta: https://en.wikipedia.org/wiki/Atalanta
   detain: https://goo.gl/RCNuOQ
   ceramics: https://en.wikipedia.org/wiki/Transparent_ceramics
   algernon: https://en.wikipedia.org/wiki/Flowers_for_Algernon
   holocaust: https://en.wikipedia.org/wiki/IBM_and_the_Holocaust
   memristor: http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.404.9037\&rep=rep1\&type=pdf
   surveillance: https://www.youtube.com/watch?v=XEVlyP4_11M#t=1487
   tor: https://www.torproject.org
   hydra: https://en.wikipedia.org/wiki/Lernaean_Hydra
   foliage: http://www.ncbi.nlm.nih.gov/pmc/articles/PMC3691134
   drake: http://www.bbc.com/future/story/20120821-how-many-alien-worlds-exist
   fermi: https://arxiv.org/pdf/1404.0204v1.pdf
   face: https://www.youtube.com/watch?v=ladqJQLR2bA
   expenditures: http://wikipedia.org/wiki/List_of_countries_by_military_expenditures
   governance: http://papers.ssrn.com/sol3/papers.cfm?abstract_id=2003531
   asimov: https://en.wikipedia.org/wiki/Three_Laws_of_Robotics
   clarke: https://en.wikipedia.org/wiki/Clarke's_three_laws
   jetpack: http://jetpackaviation.com/
   hoverboard: https://www.youtube.com/watch?v=WQzLrvz4DKQ
   eyes_five: https://en.wikipedia.org/wiki/Five_Eyes
   eyes_nine: https://www.privacytools.io/
   eyes_fourteen: http://electrospaces.blogspot.nl/2013/12/14-eyes-are-3rd-party-partners-forming.html
   tourism: http://www.spacefuture.com/archive/investigation_on_the_economic_and_technological_feasibiity_of_commercial_passenger_transportation_into_leo.shtml

A src/main/resources/com/scrivenvar/xml.css

 .tagmark {
     -fx-fill: gray;
+}
 .anytag {
     -fx-fill: crimson;
+}
 .paren {
     -fx-fill: firebrick;
     -fx-font-weight: bold;
+}
 .attribute {
     -fx-fill: darkviolet;
+}
 .avalue {
     -fx-fill: black;
+}
 .comment {
 	-fx-fill: teal;
+}

A src/test/java/com/scrivenvar/definition/TreeItemInterpolatorTest.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import javafx.scene.control.TreeItem;
 import org.junit.jupiter.api.Test;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 public class TreeItemInterpolatorTest {
   private final static String AUTHOR_FIRST = "FirstName";
   private final static String AUTHOR_LAST = "LastName";
   private final static String AUTHOR_ALL = "$root.name.first$ $root.name.last$";
   /**
    * Test that a hierarchical relationship of {@link TreeItem} instances can
    * create a flat map with all string values containing key names interpolated.
    */
   @Test
   public void test_Resolve_ReferencesInTree_InterpolatedMap() {
     final var root = new TreeItem<>( "root" );
     final var name = new TreeItem<>( "name" );
     final var first = new TreeItem<>( "first" );
     final var authorFirst = new TreeItem<>( AUTHOR_FIRST );
     final var last = new TreeItem<>( "last" );
     final var authorLast = new TreeItem<>( AUTHOR_LAST );
     final var full = new TreeItem<>( "full" );
     final var expr = new TreeItem<>( AUTHOR_ALL );
     root.getChildren().add( name );
     name.getChildren().add( first );
     name.getChildren().add( last );
     name.getChildren().add( full );
     first.getChildren().add( authorFirst );
     last.getChildren().add( authorLast );
     full.getChildren().add( expr );
     final var map = TreeItemAdapter.toMap( root );
     var actualAuthor = map.get( "$root.name.full$" );
     var expectedAuthor = AUTHOR_ALL;
     assertEquals( expectedAuthor, actualAuthor );
     MapInterpolator.interpolate( map );
     actualAuthor = map.get( "$root.name.full$" );
     expectedAuthor = format( "%s %s", AUTHOR_FIRST, AUTHOR_LAST );
     assertEquals( expectedAuthor, actualAuthor );
+  }
+}